[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: After a git merge and manual correction of a conflict, how do I tell
|
From: |
Alan Mackenzie |
|
Subject: |
Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed? |
|
Date: |
Wed, 27 May 2015 15:47:17 +0000 |
|
User-agent: |
Mutt/1.5.23 (2014-03-12) |
Hello, Eli.
On Wed, May 27, 2015 at 05:37:15AM +0300, Eli Zaretskii wrote:
> > Date: Tue, 26 May 2015 22:39:28 +0000
> > From: Alan Mackenzie <address@hidden>
> > Where is this 'bzr resolve' equivalent documented?
> In your situation, the equivalent is "git reset .gitignore".
Thanks. That's exactly what I've done, and it worked fine.
--
Alan Mackenzie (Nuremberg, Germany).
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, (continued)
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Stefan Monnier, 2015/05/26
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/26
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/26
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/26
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Dmitry Gutov, 2015/05/27
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/27
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Dmitry Gutov, 2015/05/27
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/27
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Dmitry Gutov, 2015/05/27
Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Eli Zaretskii, 2015/05/26
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?,
Alan Mackenzie <=
Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Steinar Bang, 2015/05/27