Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Bitbucket Closes a Branch Even Though the Merge Failed Due to Conflicts

sholsinger September 3, 2015

I just lost two issue branches on bitbucket because I was trying to merge them. I checked the 'close after merging' checkbox intending to close them after they were merged. Unfortunately the merge failed and they were 'closed' anyway.

 

Steps to reproduce:

  1. Create a branch with a commit that conflicts with master.
  2. Attempt to merge the branch with master via Bitbucket's web UI. (Ensure you select the "Close source branch" checkbox)
  3. The merge will fail and you'll be alerted.
  4. Click the browser's back button and you'll see a 404 message because the branch was closed.

 

2 answers

0 votes
Gary
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
October 7, 2015

Hi Stephen,

Yes - this is a bug reported at https://bitbucket.org/site/master/issues/10242/unintentional-branch-deletions-from-merge.

Cheers,
Gary 

0 votes
Seth
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
September 4, 2015

This sounds to me like a genuine bug, which should be reported at jira.atlassian.com

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events