Stash issues with GitFlow / branch merging issues


I'm using GitFlow with Stash, and I'm having problems. To reproduce:

1) Create a new repository. It will have one branch - master. Make initial commit to master.

2) Create develop branch from master by selecting "Create new branch from here". Make two commits to develop branch.

3) Create release branch from develop. Make one commit to release branch.

4) Create pull request release -> master. Merge.

At this point, branch diagram looks like this:


This is the first problem - shouldn't the lines be connected at the top: release/1 -> master?

Then continuing:

5) Create pull request release -> develop. Merge.

6) Delete release branch.

7) Create hotfix branch from master. Make a commit to hotfix branch.

At this point , branch diagram looks like this:

gitflow2.gifNow second problem: if I compare hotfix branch to develop, diff shows not only the additional changes since commit 9bf8f5ff8f9, but everything since the initial commit when the lines in the diagram had a shared point f5df930aef2.

Third and the most severe problem: if I create a pull request hotfix -> develop, I get conflicts for every change that was made in the hotfix branch.

I presume this is not how Stash is supposed to behave? Can anyone tell me how to solve this?

0 answers

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
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...

1,944 views 1 5
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