Re: Another git question

[Dima K. <gn...@di...>]

Ethan A Merritt via gnuplot-beta <gnu...@li...> writes:

> The point of the operation is that it is not at the same revision.
> What I'm trying to do is convert my usual workflow into git-speak.
> New features are developed and tested against the development branch.
> If they pan out, I go back and apply them to the stable branch.

I don't have time to do a lot of typing right now, but I'll answer the
actual question.

You don't want to deal with patches to do this; you COULD, but it's more
trouble than it's worth.

If you have two different trees (accessible as branches, tags, on a
remote somehere, whatever), you can pull in individual arbitrary commits
with 'git cherry-pick', or pull in whole chunks of the tree with 'git
rebase' or 'git rebase --onto' if you need to be fancy. Clearly these
operations can fail due to a conflict. It'll then stop and tell you what
to do.

I'll type more tomorrow if you don't get it going by then.