Reformatted excerpts from Tero Tilus's message of 2009-12-29: > Assume I have a feature-branch which is merged to my-daily-sup and I > go --amend a commit in that feature-branch. How would I now get > my-daily-sup up to date? (also assume that merge from feature-branch > is not the tip of my-daily-sup so that git reset HEAD^ && git merge > feature-branch is not a solution)
If you --amend, then remerging will likely create a conflict. There might be a way of rebase -i on my-daily-sup to leave off the original merge commit, or you could "unmerge it" with the horribleness that is `git revert -m 1` on the original merge commit, leaving daily-sup with some reverse commits. The short answer is: don't do that. Avoid things that change the head on a branch that's been published or merged or otherwise used. Make an additional commit instead of --amend, or be prepared to do some work. (I realize this isn't ideal because presumably you're trying to keep both a clean topic branch and a clean daily-sup branch, but rebasing and amending necessarily drops the history that git needs to merge changes properly.) -- William <wmorgan-...@masanjin.net> _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel
