-
Suggestion
-
Resolution: Unresolved
-
None
-
None
-
42
-
We should allow support of git merge drivers on a repo-by-repo basis for PRs and branch model auto merges. This could include built in merge drivers (such as union) and custom merge drivers.
Configuration could be done via config-as-code (e.g. via .gitattributes like Git supports) or in the application.
This may be tricky to do as under the hood we use merging to calculate the effective diff for PRs and you'd probably want to see the effective diff unmolested by the merge driver but then perform the merge using the merge driver.
- is duplicated by
-
BSERV-9348 Allow the use of Custom merge driver for merge and pull requests
- Closed
-
BSERV-10973 Support for Merge Drivers
- Closed
-
BSERV-19161 Add functionality to use union merge in Bitbucket
- Closed