Re: Rewriting bzrmerge.el

[Eli Zaretskii]

> From: David Engster <address@hidden>
> Cc: address@hidden,  address@hidden,  address@hidden
> Date: Sat, 22 Nov 2014 17:13:29 +0100
> 
> Eli Zaretskii writes:
> > What are the assumptions about the location of the release branch?  Do
> > you assume the release branch is in the same cloned repo as master, or
> > are there provisions for having the branch in another clone?
> 
> As long as you use git-new-workdir, that shouldn't matter.

You mean, gitmerge.el will discover that and DTRT by itself?  That's
way cool!

> The 'trunk' checkout should also have a local tracking branch
> 'emacs-24'.

I don't think it's a good idea to rely on that, because it's something
that's too easy to forget.

> Alternatively, we could default to merge origin/emacs-24, which
> wouldn't even require a local tracking branch.

Yes, please, let's do that.

Thanks.