Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

How long to detect manual merge in Bitbucket server?

maddy302 March 10, 2020 edited

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. 

1 answer

0 votes
Maciej Adamczak
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 17, 2020 edited

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 

maddy302 March 18, 2020

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.

Maciej Adamczak
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 18, 2020

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

Like maddy302 likes this

Suggest an answer

Log in or Sign up to answer
TAGS
atlassian, loom, AI, meeting recording, community

[NEW] Record your meetings with Loom

Welcome to great meetings, with less work. Automatically record, summarize, and share instant recaps of your meetings with Loom AI.

Learn more
AUG Leaders

Atlassian Community Events