Stash/SourceTree GitFlow

I'm evaluating Stash and SourceTree for my organization. We use gitflow today, and are simply using command line interface. We want to add code review, and the Stash pull request feature looks like it would fit the bill very nicely.

I believe I've figured out how to work within SourceTree and Stash up to the point where we create a pull request. At that point I've merged the change into develop on Stash and it properly deletes the branch on the Stash repo.

However, I'm left with a feature branch on the local repository. What should we do with that feature branch? Finishing it on the local repository results in a merge to develop. But, the code's already been merged to develop in the Stash repo. Seems like I get duplicated merges.

Or, should we simply delete the local branch after it's been merged into develop in the Stash repo?

1 answer

1 accepted

Hi Dale,

It's as simple as deleting the local branch. :)

If you find that the 'remote' feature branch still hangs around in your local repository, even though Stash deleted it, you might want to 'prune' during fetch.

The Stash team uses Pull Requests as our primary source of code review without any problems. Let us know if you find something missing.

Charles

Thanks Charles. Simple is always preferred. I was just concerned that perhaps I was somehow dropping a step.

And, your suggestion on "fetch" is certainly appreciated as I noticed the remote branches were in fact still hanging around in the local repo.

No worries Dale. Git and DVCS are great, but can certainly be a little confusing when changes can happen in different places.

Best of luck. :)

Charles

Suggest an answer

Log in or Join to answer
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

711 views 0 4
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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot