-
Suggestion
-
Resolution: Unresolved
-
None
-
None
-
None
-
11
-
We have a policy to always rebase our local branches as method of resolving merge conflicts. The help text you get in Bitbucket Server when opening the "More information" pop-up is therefor confusing.
"This pull request can't be merged. You will need to resolve conflicts to be able to merge. More information."
It suggests a merge from to-branch.
Please make the content of this pop-up configurable per repository.
- is related to
-
BSERV-7561 Improve merge conflict resolution instructions
- Gathering Interest
-
BSERV-7617 Merge Conflicts Instruction is not applicable when branch permissions are in effect
- Gathering Interest
- mentioned in
-
Page Loading...