git-flow fetch before performing finish

I'm currently exploring using git flow for our team to uniformize our flows inside SourceTree.

One question/issue remains, though. As features emerge and get integrated in the develop branch elsewhere, a developper who has just finished a feature (using git flow feature finish) will have, at that point, a develop branch that is older than what is on origin.

Finishing the feature at that point will make the local develop branch different from origin's past, which can confuse some users in our team.

What I would like is, when finishing a feature through git-flow inside Sourcetree, that it would first synchronize its local develop branch with what's on origin, THEN finish the feature (i.e. merge the feature back onto local develop.)

There is a parameter, git flow feature finish -F which "fetch[es] from $ORIGIN before performing finish". Would that be the option I need? How would I use it with SourceTree? (Or does git-flow perform this at all?)

Thanks for your time.

1 answer

This widget could not be displayed.

We don't offer that option or expose a way to add it directly within the UI. You could create a custom action to do that though, I suspect. Please file a ticket for us to track the improvement: https://jira.atlassian.com/browse/SRCTREE (macOS) or https://jira.atlassian.com/browse/SRCTREEWIN (Windows). 

Cheers,

Brian Ganninger
Senior Mac Developer, Sourcetree

Suggest an answer

Log in or Sign up to answer
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

879 views 2 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you