Stash issues with GitFlow / branch merging issues

Hi, 

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:

gitflow1.gif

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
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

22,887 views 26 12
Join discussion

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