Re: Stupid git!

[Alan Mackenzie]

Hello, Eli.

On Sat, Sep 12, 2015 at 06:16:51PM +0300, Eli Zaretskii wrote:
> > Date: Sat, 12 Sep 2015 13:02:55 +0000
> > From: Alan Mackenzie <address@hidden>
> > Cc: address@hidden

> > > 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.

> We already considered that around the time we switched to Git, and
> decided against it.  The disadvantages you don't see come up when you
> are merging from a feature branch, and you have also merged from
> master to that branch.

> So instead of rebasing we recommend just "git pull", which will merge
> the upstream changes with yours.

I just did `git pull'.  This didn't merge the upstream changes into
my repository.  Instead it put the upstream file change into my working
directory, discarding the other contributer's change log.  If I
understand correctly, that is.

I think the best thing for me to do now is `git checkout <file>' to
revert that changed file, then `git pull --rebase' to get the change
again (and likely, quite a few others which have been done since), then
`git push' to get my change into savannah.

-- 
Alan Mackenzie (Nuremberg, Germany).