Proposal: better library management ideas (was: how to checkout proper submodules)

[Daniel Trstenjak]

Hi Ian,

On Mon, Jun 10, 2013 at 11:45:22AM +0100, Ian Lynagh wrote:
> Is this possible with subtrees?:
> 
> * Initially ghc's Cabal repo is at the same commit as upstream
> * We make a local commit 123 in Cabal to fix some bug
> * Cabal upstream makes a commit 456 to fix the same bug differently
> * We jump to commit 456, in such a way that we don't end up merging
>   with our 123 commit every time we pull from Cabal in the future

Yes.

Every repository that's added by git-subtree to your repository is
represented as a separate branch. So everything that applies to the
merging of branches also applies to the merging by git-subtree.


Greetings,
Daniel