spdr870/gitextensions — Issue #727: Conflict resolution window labels local as theirs and remote as ours during normal merge.
Author: dleinhaeuser
Created: 2011-11-29 10:13:38+00:00
State: open

## Description
When during a regular local merge there is a conflict, the right click menu of the files listed in the conflict resolution window will show the following entries:

Choose local (theirs)
Choose remote (ours)

From what I understand about git it should say:

Choose local (ours)
Choose remote (theirs)

This can be quite confusing, because the two names contradict each other.

## How to reproduce
1. Start a local merge that will produce a merge conflict.
2. When asked whether you want to resolve conflicts press "Yes".
3. Choose a file from the conflict window and press the right mouse button on it.

## Expected result
A menu opens that contains - among other things - the following entries:

Choose local (ours)
Choose remote (theirs)

## Actual result

A menu opens that contains - among other things - the following entries:

Choose local (theirs)
Choose remote (ours)