Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root


1 badge earned


Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!


Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.


Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!


When I use Gitflow and there is a conflict, the branch is not deleted

 I use BitBucket Cloud with GitKraken as GUI to manage my repositories.

To work, my team and I use the Gitflow method.

How our workflow for creating a new branch and terminating it works:

  1. We started a new Branch (Feature/Hotfix). For the Feature type, we rely on Current Branch (master) instead of "Lastest develop".

  2. When we're done working, we click finish branch feature/name-branch. And we leave the "Delete branch" option checked instead of "Rebase on develop".

  3. If a conflict occurs, it will stay on the develop branch until we fix the conflicts. That done, we start a Release, based on "Latest develop" instead of "Current branch" and finalize the Release branch.


It happens that when there are these conflicts, the branch sent to bitbucket is not deleted. And in our GitKraken, they are not "merged" in the repository timeline, but actually in the master.

Am I doing something wrong working with conflicts?

In the image below, you can see that the feature-2 branch was terminated and was not merged into the master line. Even the code created in it being in the master.

Captura de Tela 2022-12-02 às 13.55.01.png

1 answer

0 votes
Theodora Boudale
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Dec 07, 2022

Hi @ThePokyWizard,

If you perform all these operations in GitKraken, I would suggest reaching out to the support team of GitKraken via or join their Slack channel to ask for help.

This application is not built by Atlassian and I don't know what commands are executed in the background, if there are any logs that can help you figure out what is happening, or if this is perhaps a bug.

Kind regards,

Suggest an answer

Log in or Sign up to answer
Site Admin
AUG Leaders

Atlassian Community Events