I have a repository on Bitbucket. I have two branches: working-branch and development-branch.
development-branch is the branch where I merge all my working branches into.
I worked on the working-branch for a long-long-long time (about 1 year - many reasons - not the point of this conversation). Then decided to merge working-branch into development-branch. I didn't do this via a pull request on Bitbucket as I usually do with my all the other branches merged into development-branch. This time around, I decided to do the merge on my local machine, in order to be able to address any merge conflicts. I pulled both branches, then merged the working-branch into development-branch (no conflicts), then pushed development-branch to origin. On development-branch, all the files and folders merged from working-branch, are in the right place, and everything works as expected.
Back in my repository on Bitbucket, verified All Branches Graph, and it shows that the working-branch "dot" is on the development branch, with the name "working-branch" next to it. Then, I switched to the Branches screen on Bitbucket repository, and it shows that all the branches that got merged have a green label on the very right side saying "Merged". With the exception of the working-branch that I merged locally and not through a pull request like I did with all the other branches.
What did I do wrong? How can I fix this problem (if possible), to show the green "Merged" label next to the working-branch.
Hi everyone, We are looking to learn more about development teams’ workflows and pain points, especially around DevOps, integrations, administration, scale, security, and the related challeng...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events