[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git conflicts
|
From: |
David Kastrup |
|
Subject: |
Re: Git conflicts |
|
Date: |
Sat, 21 Jun 2008 19:32:04 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) |
"Valentin Villenave" <address@hidden> writes:
> What's most annoying is that a merge is actually hard to revert.
Hm? Do a checkout of the version before the merge, make a soft reset to
HEAD again and recommit. Something like that.
--
David Kastrup, Kriemhildstr. 15, 44793 Bochum
- Re: Git conflicts, (continued)
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Johannes Schindelin, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, John Mandereau, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/22
- Re: Git conflicts, Valentin Villenave, 2008/06/22
Re: Git conflicts, Rune Zedeler, 2008/06/21
- Re: Git conflicts, Valentin Villenave, 2008/06/21
- Re: Git conflicts,
David Kastrup <=
Re: Git conflicts, Johannes Schindelin, 2008/06/21
Re: Git conflicts, Rune Zedeler, 2008/06/22
Re: Git conflicts, Johannes Schindelin, 2008/06/22