How do I get finished features into ongoing features?

[kevinold]

Hi All,

I'm using gitflow in a repo and have a few features going at once.

I create 2 features at the same time: feature/A and feature/B

I finish feature/A, and it is available in 'develop', but I'd like it
to be available on feature/B.

My gut is to do a 'git rebase develop' on feature/B to pull in the new
changes. Is this right? Is there a better way?

Thanks for any help with this.

Kevin

[Jacob Atzen]

That is definitely a viable option. Or you could merge feature/A into
feature/B, or merge develop into feature/B. In the end you'll have the
same code whatever you choose, so it's just a matter of taste in how
you want your history to look.

--
Cheers,
- Jacob Atzen

[Vincent Driessen]

Hi Kevin,

> I create 2 features at the same time: feature/A and feature/B
> I finish feature/A, and it is available in 'develop', but I'd like it
> to be available on feature/B.

This is not supported by the git-flow tool, but you can use the regular
Git commands get this working. git-flow does not forbid you to use
regular Git commands :)

EIther merge feature/A into feature/B if feature/A is not yet (fully)
finished. Or finish feature/A, then rebase feature/B against develop, by
using "git flow rebase" inside feature/B.

Cheers,
Vincent