Re: [PATCH] Documentation: document pitfalls with 3-way merge

2013-12-08 Thread brian m. carlson
On Sun, Dec 08, 2013 at 02:40:13PM -0800, Jonathan Nieder wrote: > brian m. carlson wrote: > > > Oftentimes people will make the same change in two branches, revert > > the change in one branch, and then be surprised when a merge > > reinstitutes that change when the branches are merged. > > Life

Re: [PATCH] Documentation: document pitfalls with 3-way merge

2013-12-08 Thread Jonathan Nieder
Hi, brian m. carlson wrote: > Oftentimes people will make the same change in two branches, revert the change > in one branch, and then be surprised when a merge reinstitutes that change > when > the branches are merged. Life is even more complicated: if the merge-base chosen happens to be a des

[PATCH] Documentation: document pitfalls with 3-way merge

2013-12-08 Thread brian m. carlson
Oftentimes people will make the same change in two branches, revert the change in one branch, and then be surprised when a merge reinstitutes that change when the branches are merged. Add an explanatory paragraph that explains that this occurs and the reason why, so people are not surprised. Sign