Hi All,
When I perform a manual merge of a PR in Bitbucket server, sometimes it detects the merge and marks the PR as merged. Sometimes it doesn't event after waiting overnight.
By Manual Merge , I mean, Locally -
- git clone
- git checkout dev/feature, git rebase master, git merge -ff-only, git push -f remote master
Can someone please help me understand what should be done on dev and master to get assured response from Bitbucket that a merge has occured.
Thanks.
Hey @maddy302 , I think that pretty much depends on how you perform the manual merge and what merge strategy you are using. If you manually merge a pull request branch without changing the commits, then Bitbucket should close the existing pull request.
Thanks,
Maciej
Sry I should have been more elaborate -
By manual merge I mean,
- I download the repo locally
- checkout the branch of the PR
- use the command line to git rebase master, git merge --ff-only locally, then push using git push -f origin master
Sometimes bitbucket detects and many a times it doesn't.
Updating the steps in the question as well.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Hey @maddy302 I think you might try to create a support request if that problem is something you can reproduce on your local instance. Here is the link you can use https://support.atlassian.com/bitbucket-server/
Thanks,
Maciej
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.