Bug 474949 - "Replace with" menu options during Rebase on a conflicting file in staging view are unclear
Summary: "Replace with" menu options during Rebase on a conflicting file in staging vi...
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 4.1   Edit
Hardware: PC Windows 7
: P3 major (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-08-14 04:00 EDT by John Hendrikx CLA
Modified: 2020-02-12 08:47 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description John Hendrikx CLA 2015-08-14 04:00:29 EDT 
I'm working on branch X (let's call it "my branch").  I rebase onto branch Y and some files are in conflict (Git Staging view is in state "Rebase w/merge")

Now, when I right-click on a conflicted file the 'replace' options either donot work or do the exact opposite of what I expect.

1) Replace with HEAD.  Does nothing, and gives no indication of anything.  I'm not sure what this even should do during a rebase conflict.

2) Replac with Index.  Does nothing, same as above.

3) Replace with "theirs".  Does the exact opposite, it replaces the conflicting file with the one in branch X (my branch).

4) Replace with "ours". Does the exact opposite, it replaces the conflicting file with the one in branch Y (some other branch... their? branch?)

Could these functions be clarified and/or fixed?