On Tue, Feb 20, 2018 at 5:00 PM, Julius Musseau <julius@xxxxxxxxxxxxx> wrote: > I was hoping to concoct a situation where "git pull --rebase" makes a > mess of things. It breaks quite easily with some workflows. They are all in the "don't do that" territory. Open a long-lived feature-dev branch, work on it. Other folks are working on master. Merge master into feature-dev. Make sure some merges might need conflict resolution. Reorg some code on master, move files around. Code some more on feature-dev branch. Merge master into feature-dev; the merge machinery will probably cope with the code move, file renames. If it doesn't, resolve it by hand. Let all that simmer for a little bit. Then try to rebase. "Doctor, it hurts when I rebase after merging with conflict resolution... " cheers, m
