[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: |
Yuri Khan |
|
Subject: |
Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed? |
|
Date: |
Thu, 28 May 2015 11:27:42 +0600 |
On Thu, May 28, 2015 at 1:53 AM, Steinar Bang <address@hidden> wrote:
> I ignore files that way with 'I' in magit (as opposed to 'i' which puts
> it in .gitignore), so I don't actually know the git command to do so,
> but the ignores end up in
> .git/info/exclude
> (which is a text file that can be opened and edited in emacs)
As far as I can tell, Git doesn’t have a dedicated command to
manipulate gitignore files. The user is supposed to edit them
directly.
- 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?, 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?, Alan Mackenzie, 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/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
- Message not available
- 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?, Tom Jakubowski, 2015/05/26
- 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?, Andreas Schwab, 2015/05/27
- 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
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?,
Yuri Khan <=
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?, Artur Malabarba, 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/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/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/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