Details
-
Suggestion
-
Resolution: Answered
-
None
-
None
-
None
Description
Problem Definition
As a developer, I would like to be able to use the "merge ours" strategy to automatically resolve conflicts in for pull requests
Suggested Solution
Add the "merge ours" strategy to the list of supported merge strategies at the repository, project, and global level
Workaround
Merge locally without a pull request, and then push the result (bypass Bitbucket Server for merging).
Attachments
Issue Links
- is incorporated by
-
BSERV-5356 Allow me to set a merge s="ours" point in the auto-merge chain
- Gathering Interest
- mentioned in
-
Page Loading...