[Top][All Lists]

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

Re: Rewriting bzrmerge.el

From: Steinar Bang
Subject: Re: Rewriting bzrmerge.el
Date: Sun, 23 Nov 2014 19:40:40 +0100
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (windows-nt)

>>>>> Eli Zaretskii <address@hidden>:

>> >>>>> David Engster <address@hidden>:

>> > It will always be able to merge origin/emacs-24. I guess you could set
>> > things up to merge from a second, separate clone (by adding it as a
>> > remote), but I don't see the need.

>> You don't need a clone for this, just a local bare repo.

> The clone is needed to actually work on the release branch, without
> having to bootstrap it each time you "git checkout" it.

I know.

The bare repo referred above to is for transferring a branch between two
separate clones on local disk.  The bare repo is separate from the two
clones named emacs24 and master.

The snipped procedure shows how to create that local repository, and how
to push a branch from one clone and merge it into a branch in the other

reply via email to

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