'I need help trying to replicate the flow I follow when using Github on Bitbucket
I have both accounts and projects on both services. I try to replicate my Github flow on bitbucket projects but so far it has not been possible. The git management is the same, but the issues or differences appear when using the GUI on the web to accept PRs.
My Github flow is as follows:
- I clone the project
- I usually have
masteranddevelopbranches. - I create a
feature/branch with code of a new feature - I create a pull request from that
feature/branch to develop - The pull request is reviewed by a peer or client.
- If the PR is ok, I make sure the
feature/branch is rebased with develop and proceed to merge withdeveloplocally and then push develop to the remote. GITHUBknows that the PR with thefeature/branch has been merged with develop and marks the PR as merged.- I go to the PR and delete the branch.
Even though I deleted the branch, I can see the code changes from the closed PR (GUI). And I could in theory
restorethat branch in the future in case I need it. But the branch won't be there as an active branch when I dogit branch -r
I try to do that in bitbucket and it is just a mess.
After doing number 6. Bitbucket does not update the PR to merged. There is no option to close a PR. There is only an option to approve, decline, or merge. But I do not want to merge using the GUI is to cumbersome. I would rather merge manually.
So now what we are doing is declining PRs. And adding a message that says that the PR was merged manually. But this feels bad to me.
The other thing is that I have a lot of branches, and if I delete a branch of a PR that has been declined then the PR that is associated with that branch will appear as empty with no commits! So history is lost.
Is bitbucket proposed flow different? Should I change something here?
I am trying to get more information about what is the common flow people follow when using bitbucket rather than Github.
Thanks in advance.
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|


