Confusing naming in merge conflicts
Summary
While resolving branch merge conflicts, labels for changes are 'theirs' and 'ours'
these labels are relative and depending on who is resolving conflict will have completely different meanings.
It becomes immediately impossible to figure out who is theirs and who is ours
This become more confusing if the person merging conflict is repo maintainer and not developer of either branches.
Steps to reproduce
-
With same user:
- Create a second branch from master.
- Change a file in master branch
- Change same lines in same file in second branch
- Send a merge request
- Now try to approve merge request, it is blocked due to conflicts
- Click resolve conflicts.
In this case both ours and theirs is same user, so identifying which panel is showing which branch becomes confusing.
- Same as above steps but do conflict resolve with owner of master branch. In this case theirs is owner of second branch and ours is owner of master branch.
- Same as above steps but do conflict resolve with owner of second branch. in this case theirs is owner of master branch and ours is owner of second branch.
Example Project
Screenshot attached
What is the current bug behavior?
Confusing ours and theirs label
What is the expected correct behavior?
Suggesting to change label ours and theirs to name of branches being merged (e.g. master, secondary).
Relevant logs and/or screenshots
N/A
Output of checks
N/A
Results of GitLab environment info
N/A
Results of GitLab application Check
N/A