[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [elpa] 01/01: Add requires to fix separate compilation.
From: |
Tassilo Horn |
Subject: |
Re: [elpa] 01/01: Add requires to fix separate compilation. |
Date: |
Fri, 28 Nov 2014 18:11:08 +0100 |
User-agent: |
Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) |
Stefan Monnier <address@hidden> writes:
>> Would it make sense to re-initialize the ELPA branch so that auctex
>> git and ELPA are the very same thing?
>
> No, "re-initialize" is never right because it loses history and might
> overwrite and lose changes. Just use "git merge", as usual.
Well, yes, but in this concrete scenario the ELPA history isn't too
important. At least not to me if I could get bidirectional "git
merge"-ability otherwise.
Bye,
Tassilo