You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
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:
We started a new Branch (Feature/Hotfix). For the Feature type, we rely on Current Branch (master) instead of "Lastest develop".
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".
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.
If you perform all these operations in GitKraken, I would suggest reaching out to the support team of GitKraken via https://help.gitkraken.com/gitkraken-client/contact-support/ or join their Slack channel https://slack.gitkraken.com/ 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.