[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Missing changes in merges from emacs-25 to master

From: Stefan Monnier
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Tue, 22 Mar 2016 14:41:53 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux)

> We've been through this: "git rebase" will cause much worse trouble if
> you have local merge-commits from feature branches.

Indeed.  The problem is very real when you want to do "git merge; git
push" and the merge is non-trivial, since you have to hurry to fix the
merge problems before someone else.

> So I at least will never use "git rebase" unless I have no
> other choice.

I do use "git rebase" when none of the local commits are merges.

When there's a merge, the only option I know of is to checkout "master",
then do a "git merge {localbranch}; git push".

I really think there should be a way to tell git to "merge in the other
direction", but Git people don't seem to listen.

> When we started using Git, I explicitly asked whether we cared about
> the messed-up DAG due to these merge-commits, and the answer was "we
> don't".  So I never looked back, and I guess others didn't, too.

What can I say, you were right.  I'm not really bothered by the shape of
the DAG itself, but the commit-diffs are pretty annoying and there are
a few other linked problems such as the one discussed in this thread.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]