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.
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
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 is even
3 matches
Mail list logo