[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git is screwed
From: |
Steinar Bang |
Subject: |
Re: git is screwed |
Date: |
Thu, 26 Mar 2015 13:21:04 +0100 |
User-agent: |
Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) |
>>>>> Harald Hanche-Olsen <address@hidden>:
>> MM lisp/ChangeLog
> That's your merge conflict.
> I have to go now, no time for the next couple hours. But perhaps
> someone else will give you advice.
What I would do here is to open the ChangeLog in emacs and look for the
conflict markers (search for "<<" (without the quotes)) and see if they
make sense to me. I then manually edit the result to what I want (I
remove the conflict markers, then either pick one of the alternatives,
both alternatives, or make a manual merge of the two, depending on what
the conflict is).
Once I'm satisfied with the results, I stage the ChangeLog file for the
merge commit:
git add lisp/ChangeLog
Right now I've told git that I've seen the conflict and have manually
resolved it, and git will complete the merge when I give the following
command:
git commit
(and as I said in a different post: I usually do this kind of merge
conflict resolution from magit)
- Re: git is screwed, (continued)
- Re: git is screwed, Richard Stallman, 2015/03/22
- Message not available
- Message not available
- Re: git is screwed, Sam Gwydir, 2015/03/23
- Re: git is screwed, Harald Hanche-Olsen, 2015/03/23
- Re: git is screwed, Richard Stallman, 2015/03/24
- Re: git is screwed, Harald Hanche-Olsen, 2015/03/24
- Re: git is screwed, Richard Stallman, 2015/03/26
- Re: git is screwed, John Wiegley, 2015/03/26
- Re: git is screwed, Richard Stallman, 2015/03/26
- Re: git is screwed, Harald Hanche-Olsen, 2015/03/26
- Re: git is screwed, Harald Hanche-Olsen, 2015/03/26
- Re: git is screwed,
Steinar Bang <=
- Re: git is screwed, Stefan Monnier, 2015/03/26
- Re: git is screwed, Eli Zaretskii, 2015/03/26
- Re: git is screwed, Steinar Bang, 2015/03/26
- Re: git is screwed, Eli Zaretskii, 2015/03/26
- Re: git is screwed, Stefan Monnier, 2015/03/26
- Re: git is screwed, Eli Zaretskii, 2015/03/27
- Re: git is screwed, Stefan Monnier, 2015/03/27
- Re: git is screwed, Steinar Bang, 2015/03/27
- Re: git is screwed, Eli Zaretskii, 2015/03/27
- Re: git is screwed, Steinar Bang, 2015/03/27