[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Automatically marking conflicts are resolved
From: |
Óscar Fuentes |
Subject: |
Re: Automatically marking conflicts are resolved |
Date: |
Tue, 07 Jan 2014 12:04:42 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
David Kastrup <address@hidden> writes:
>> 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.
>
> Uh, why would that be too late? Before committing the merge, git diff
> lists all merge conflicts. After committing the merge, the information
> is in the commit message. The commit can still be amended.
>
> Whether or not you choose to commit first, test later (after all, a
> commit is not the same as an upstream push and can always be amended) or
> test first, commit later, the information is readily available.
I'm wary of using commits as temporary storage for work-in-progress on
merges or any other atomic change. A distraction at the wrong moment may
cause big trouble. There is a policy here that says that, except for
experimental throw-away projects, all changes must pass some tests
before committing them.
Also it is convenient to have the diff updated as you work on fixing the
merge, with the merge-specific diff indicators.
- Re: Move to git is imminent - awaiting Stefan's approval, (continued)
- Re: Move to git is imminent - awaiting Stefan's approval, Eli Zaretskii, 2014/01/06
- RE: Move to git is imminent - awaiting Stefan's approval, Drew Adams, 2014/01/06
- Re: Move to git is imminent - awaiting Stefan's approval, Stefan Monnier, 2014/01/06
- Re: Move to git is imminent - awaiting Stefan's approval, Óscar Fuentes, 2014/01/06
- Re: Move to git is imminent - awaiting Stefan's approval, Stefan Monnier, 2014/01/06
- Automatically marking conflicts are resolved (was: Move to git is imminent - awaiting Stefan's approval), Óscar Fuentes, 2014/01/06
- Re: Automatically marking conflicts are resolved, David Kastrup, 2014/01/06
- Re: Automatically marking conflicts are resolved, Óscar Fuentes, 2014/01/06
- Re: Automatically marking conflicts are resolved, David Kastrup, 2014/01/07
- Re: Automatically marking conflicts are resolved,
Óscar Fuentes <=
- Re: Automatically marking conflicts are resolved, David Kastrup, 2014/01/07
- Re: Automatically marking conflicts are resolved, Óscar Fuentes, 2014/01/07
- Re: Automatically marking conflicts are resolved, Stephen J. Turnbull, 2014/01/07
- Re: Move to git is imminent - awaiting Stefan's approval, Leo Liu, 2014/01/06
- Re: Move to git is imminent - awaiting Stefan's approval, Thierry Volpiatto, 2014/01/07
- Re: Move to git is imminent - awaiting Stefan's approval, Stefan Monnier, 2014/01/07
- Re: Move to git is imminent - awaiting Stefan's approval, Eli Zaretskii, 2014/01/07
- Re: Move to git is imminent - awaiting Stefan's approval, Barry Warsaw, 2014/01/08
- Re: Move to git is imminent - awaiting Stefan's approval, Stefan Monnier, 2014/01/08
- Re: Move to git is imminent - awaiting Stefan's approval, Eli Zaretskii, 2014/01/09