Re: Stupid git!

[Alan Mackenzie]

Hello, Giuseppe.

On Sat, Sep 12, 2015 at 01:45:38PM +0200, Giuseppe Scrivano wrote:
> Alan Mackenzie <address@hidden> writes:

> > Hello, Emacs.
> >
> > git has struck again, and another couple of hours valuable time have
> > been lost.
> >
> > Having "staged" a change with `git add', I then tried to commit it with
> > `git commit'.  Somebody else had got in before me, so I had to pull
> > their changes first - fair enough.
> >
> > So I did `git pull'.  I was then dumped into an editing session for a
> > merge operation for .../test/automated/file-notify-tests.el.  Eh?  I've
> > never touched this file in my life, and didn't even know it existed.  So
> > why is a merge necessary/why has a merge been (half-)done?  Why didn't
> > git pull simply merge the changes to this file into my repository and
> > working directory?

> are you working and pulling on the same branch?

Yes.

> Have you used --rebase to pull to apply your commits after you pulled
> all the changes from the remote repository?

No, I didn't.  I should have done.  I don't think there are any
disadvantages to doing so.

> Regards,
> Giuseppe

-- 
Alan Mackenzie (Nuremberg, Germany).