Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Michael Albinus]

Stefan Monnier <address@hidden> writes:

>> branch: master
>> commit f9fabb2bb099d944cc97a87933b86b9eae02d067
>> Merge: 570edf2 b0f3a49
>> Author: Michael Albinus <address@hidden>
>> Commit: Michael Albinus <address@hidden>
>
>>     Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
>     
> What happened, here?
>
>    git diff 570edf2..f9fabb2bb099d944cc97a87933b86b9eae02d067
>
> is empty (i.e. the "merge" just threw away all the changes from
> b0f3a49, i.e. from "master").  And indeed:
>
>    git diff b0f3a49..f9fabb2bb099d944cc97a87933b86b9eae02d067
>
> shows that you reverted a bunch of the recent commits
> applied to "master".  How did this happen?

Oh shit. Something like this:

- I've seen the messages in emacs-devel that I did an error syncing
  tramp.el from the Tramp repository. Panic.

- I've fixed this in the local Emacs repository, and committed it.

- I've tried to push tramp.el, which failed (due to further commits in
  the remote Emacs repository).

- I've pulled from the remote Emacs repository, getting a conflict in
  tramp.el. Glenn had fixed the problem already, but there are
  whitespace difference between his and my change.

- I've fixed the conflict in tramp.el, and committed it.

- I've tried to push, but I was said that it's not possible because the
  previous merge wasn't finished.

- ERROR: I've reverted all open changes in my Emacs repository.

- I've pushed.

I must claim, that I'm still in fight with git. After a merge conflict,
it let's *other* items edited I have never touched, and I often don't
know what to do :-(

Conclusion: I will try to implement a local pull-before-and-push-after
commit policy. This shall minimize merge conflicts.

I am very sorry that I have brought to you additional work, again.

>         Stefan

Best regards, Michael.