Possibility to solve merge conflicts on GitLab regardless of merge conflict

Proposal

Normally, when there is a merge conflict in a merge request, the developer gets the option to either “Resolve conflicts” (using the GitLab GUI) or “Merge locally” (not using the GitLab GUI). image image

However, when there is a merge conflict in a merge request where one branch has modified a file, and the other branch has deleted the same file, only the “Merge locally” option is given. image image

The purpose of this request to GitLab is to the GUI to allow “Resolve conflicts” in all cases including when one branch has modified a file and the other branch has deleted the same file.

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.

Edited by 🤖 GitLab Bot 🤖