|
From: | Óscar Fuentes |
Subject: | Re: Automatically marking conflicts are resolved |
Date: | Tue, 07 Jan 2014 01:51:35 +0100 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
David Kastrup <address@hidden> writes: >> On the compile/test phase it is useful to know which problems comes from >> the automatic merge and which ones comes from the areas you edited while >> resolving the conflicts. > > The commit message proposed by Git lists the merge conflicts. While the > committer may remove this list, it is usually a good idea to keep it, > for exactly that reason. That's not enough and too late. I wont commit the merge without testing it first and meanwhile a clear separation of conflicted areas is useful.
[Prev in Thread] | Current Thread | [Next in Thread] |