Details
-
Bug
-
Resolution: Fixed
-
Medium
Description
My colleague just hit the merge button with "delete this branch" checked. The merge failed due to conflicts, but the branch was deleted.
The branch shouldn't be deleted unless it was successfully merged.