Resolve conflicts on UserMergeToRef request
Problem to solve
When the source and target branch contain a conflict, UserMergeToRef
is likely to fail. Within #232484 (closed) we've introduced AllowConflicts
param which let UserMergeToRef
succeed when both-modified conflict appears.
In order to handle most of the classes of conflicts in a diff, we need to successfully merge to ref in case those classes of conflicts appear.
Proposal
- gitaly!2626 (merged) started merging conflicts with markers directly in diff
- gitaly!2997 (merged) is porting the functionality to Golang
Instead of merging markers into the diff, we could consider the option of resolving the conflicts by merging our changes to the diff. That will allow us to merge to ref even if there are conflicts.
After that, the conflicts can be displayed on diff by using Gitaly Conflicts API, just like we've implemented it here: !47003 (merged)
Edit notes: Replaced the MR for "porting the functionality to Golang" with a different one because the old one (gitaly!2642 (closed)) was closed and implemented in a different MR.
This page may contain information related to upcoming products, features and functionality. It is important to note that the information presented is for informational purposes only, so please do not rely on the information for purchasing or planning purposes. Just like with all projects, the items mentioned on the page are subject to change or delay, and the development, release, and timing of any products, features, or functionality remain at the sole discretion of GitLab Inc.