[IPython-dev] Merging only 1 commit from branch to trunk

[Fernando Perez]

2009/10/18 Ville M. Vainio <vivainio at gmail.com>:
>
> You are perfectly able to do a merge - you'll just have to resolve the
> conflict where it happens. After that is done, the branches are fully
> mergeable again (and the rest of the changes are merged normally).

Ah, OK.  I thought it was a situation similar to that with svn (in the
old days, I think svn-merge is better now) where you'd have to track
merged revisions by hand separately, and do all subsequent merges with
explicit, manual revision markers.

This isn't ideal if the cherrypicked commit is large (the conflict
resolution could be a fair bit of work) but it's not the end of the
world either, and at least it's a one-time deal.

Cheers,

f