{"issue":{"created_at":"2011-11-29T10:13:38Z","state":"open","updated_at":"2011-12-06T20:32:09Z","user":{"gravatar_id":"1d4b9bca7ac1838a06e944a0dad4625a","id":35018,"url":"https://api.github.com/users/dleinhaeuser","login":"dleinhaeuser","avatar_url":"https://secure.gravatar.com/avatar/1d4b9bca7ac1838a06e944a0dad4625a?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png"},"comments":6,"body":"## Description\r\nWhen 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:\r\n\r\n    Choose local (theirs)\r\n    Choose remote (ours)\r\n\r\nFrom what I understand about git it should say:\r\n\r\n    Choose local (ours)\r\n    Choose remote (theirs)\r\n\r\nThis can be quite confusing, because the two names contradict each other.\r\n\r\n## How to reproduce\r\n1. Start a local merge that will produce a merge conflict.\r\n2. When asked whether you want to resolve conflicts press \"Yes\".\r\n3. Choose a file from the conflict window and press the right mouse button on it.\r\n\r\n## Expected result\r\nA menu opens that contains - among other things - the following entries:\r\n\r\n    Choose local (ours)\r\n    Choose remote (theirs)\r\n\r\n## Actual result\r\n\r\nA menu opens that contains - among other things - the following entries:\r\n\r\n    Choose local (theirs)\r\n    Choose remote (ours)\r\n","assignee":null,"id":2382557,"number":727,"labels":[],"pull_request":{"patch_url":null,"html_url":null,"diff_url":null},"title":"Conflict resolution window labels local as theirs and remote as ours during normal merge.","html_url":"https://github.com/spdr870/gitextensions/issues/727","closed_at":null,"url":"https://api.github.com/repos/spdr870/gitextensions/issues/727","milestone":null},"action":"created","comment":{"created_at":"2011-12-06T20:32:09Z","updated_at":"2011-12-06T20:32:09Z","user":{"gravatar_id":"1d4b9bca7ac1838a06e944a0dad4625a","id":35018,"url":"https://api.github.com/users/dleinhaeuser","login":"dleinhaeuser","avatar_url":"https://secure.gravatar.com/avatar/1d4b9bca7ac1838a06e944a0dad4625a?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png"},"body":"Okay. Apparently \"ours\" and \"theirs\" switch places during a rebase.\r\n\r\nCould it be, that git gui is set up such, that \"local\" and \"remote\" make sense for merge conflict during a pull operation?\r\n\r\nIn any case this certainly confuses people switching from git gui (like me).\r\nMaybe it would be sufficient to point this out in the documentation.","id":3038235,"url":"https://api.github.com/repos/spdr870/gitextensions/issues/comments/3038235"}}