Bug 497567 - Replace with Theirs / Ours should use branch info if available instead of commit
Summary: Replace with Theirs / Ours should use branch info if available instead of commit
Status: RESOLVED WORKSFORME
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords: helpwanted, usability
Depends on:
Blocks:
 
Reported: 2016-07-08 08:25 EDT by Lars Vogel CLA
Modified: 2022-05-19 02:26 EDT (History)
2 users (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 Lars Vogel CLA 2016-07-08 08:25:44 EDT 
If I have a merge conflict, the option Replace With-> Ours and Theirs is very useful.

Not so useful is that is shows the commit ID instead and not the branch pointer. 

For me it would be much more useful, if it shows the branch pointers if available, e.g. origin/master and master.
Comment 1 Lars Vogel CLA 2022-05-19 02:26:05 EDT 
I think that has been fixed in the past.