Conversation
Notices
-
clacke (clacke)'s status on Wednesday, 10-Aug-2016 11:38:16 CEST clacke Rebasing on top of rebased predecessors is not working well. I think there's a convoluted solution, which involves more #rebasing.
#git-
clacke (clacke)'s status on Wednesday, 10-Aug-2016 11:45:26 CEST clacke ... or maybe I'll use grafts! If each --amend is construed as a successor of the amended commit, that should improve things. -
clacke (clacke)'s status on Wednesday, 10-Aug-2016 12:35:38 CEST clacke Grafts actually made the conflicts worse. Next idea: Graft, rebase the grafted, rebase onto that, then rebase onto the ungrafted...
-