[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Stupid git!
From: |
Alan Mackenzie |
Subject: |
Re: Stupid git! |
Date: |
Mon, 14 Sep 2015 10:49:15 +0000 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
Hello, Eli.
On Sun, Sep 13, 2015 at 09:49:43AM +0300, Eli Zaretskii wrote:
> > Date: Sat, 12 Sep 2015 21:51:14 +0000
> > Cc: Eli Zaretskii <address@hidden>, address@hidden, address@hidden
> > From: Alan Mackenzie <address@hidden>
[ .... ]
> > > If you're in the middle of a merge, it's a recipe for disaster.
> > :-). OK, but the immediate problem is that _I_ didn't modify
> > file-notify-tests.el. Somebody else did, and git put his changes into
> > my working directory and `git add'ed it.
> That's what happens when there are merge conflicts: Git suspends the
> merge in its middle.
Yes. I had misunderstood "conflict". I had thought it meant a merge
conflict in some file, whereas it just meant that other, possibly
unrelated, changes had taken place.
> > I don't have the log entry for this change. So am I supposed to
> > just commit this, with my own log entry?
Acutally, I did have this log entry, but `git log' didn't display it. It
needed `git log --all' to see it.
> Commit everything in one go, with "git commit", and give it a single
> log entry, something like "resolve merge conflicts".
Thanks, I've done this.
> > I don't really understand what "you are still merging" is supposed to
> > mean. How do I get out of the "merging" state cleanly, without
> > commiting somebody else's changes?
> You _must_ commit. A successful merge in Git always ends in a commit,
> and in this case you need to do it manually, because the automatic
> merge failed due to diverging.
OK. I suppose there's a good reason for git aborting the merge rather
than completing it in the obvious manner, but I can't see it at the
moment.
--
Alan Mackenzie (Nuremberg, Germany).
- Re: Stupid git!, (continued)
- Re: Stupid git!, Alan Mackenzie, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14
- Re: Stupid git!, Stefan Monnier, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/13
- Re: Stupid git!,
Alan Mackenzie <=
- Re: Stupid git!, Stephen J. Turnbull, 2015/09/14
- Re: Stupid git!, Dmitry Gutov, 2015/09/13
- Re: Stupid git!, Stephen J. Turnbull, 2015/09/13
- Re: Stupid git!, Dmitry Gutov, 2015/09/14
- Re: Stupid git!, Alan Mackenzie, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/14
- Re: Stupid git!, Dmitry Gutov, 2015/09/14
- Re: Stupid git!, Steinar Bang, 2015/09/14
- Re: Stupid git!, Steinar Bang, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/13