Conversation

Notices

1. Claes Wallin (韋嘉誠) (clackemovedtoheldscalla@quitter.se)'s status on Wednesday, 10-Aug-2016 09:38:16 UTC Claes Wallin (韋嘉誠)
   Rebasing on top of rebased predecessors is not working well. I think there's a convoluted solution, which involves more #rebasing.
   
   #git
   • Claes Wallin (韋嘉誠) (clackemovedtoheldscalla@quitter.se)'s status on Wednesday, 10-Aug-2016 09:45:26 UTC Claes Wallin (韋嘉誠)

     in reply to
     ... or maybe I'll use grafts! If each --amend is construed as a successor of the amended commit, that should improve things.
   • Claes Wallin (韋嘉誠) (clackemovedtoheldscalla@quitter.se)'s status on Wednesday, 10-Aug-2016 10:35:38 UTC Claes Wallin (韋嘉誠)

     in reply to
     Grafts actually made the conflicts worse. Next idea: Graft, rebase the grafted, rebase onto that, then rebase onto the ungrafted...