[Top][All Lists]

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

Re: merging emacs-24

From: Ted Zlatanov
Subject: Re: merging emacs-24
Date: Thu, 27 Nov 2014 19:30:12 -0500
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux)

On Thu, 27 Nov 2014 18:32:54 +0100 David Engster <address@hidden> wrote: 

DE> Ted Zlatanov writes:
>> I don't think Git merges can work that way, though. They bring in the
>> whole branch, you can't exclude some commits.

DE> You cannot exclude them, but you can merge them with merge strategy
DE> 'ours'. That's what gitmerge.el does.

Yup, I see that.  Lovely; I had always applied the strategy to the whole
commit before.

>> I can't believe I did that.  Sorry.  It's not harmful, but I was
>> careless.  I've now added this alias to my gitconfig:

DE> I think the easiest way to avoid this is to merge the remote branch
DE> instead of the local tracking one.

Oh, that's very helpful. I have always had to remember to update the
local branch and then merge from it.  Thanks for the hints.


reply via email to

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