Eclipse Community Forums: EGit / JGit » Feature Wish: more descriptive Information instead of "Ours"/"Theirs"

Help

Home

Home » Eclipse Projects » EGit / JGit » Feature Wish: more descriptive Information instead of "Ours"/"Theirs"

Show: Today's Messages :: Show Polls :: Message Navigator

Feature Wish: more descriptive Information instead of "Ours"/"Theirs" [message #1852738]

Thu, 02 June 2022 13:10

Ernst Blecha

Messages: 14
Registered: December 2019

Junior Member

During a slightly complicated rebase a colleague and I were wondering if there is any way to improve the labels "ours" and "theirs" for replacing the merge result. Is there a possibility to show the names of the branches this relates to?

We are aware that this terminology is based on what git itself uses, but freeing up concentration for the actual code would be really beneficial.

best regards
Ernst Blecha

Report message to a moderator

Re: Feature Wish: more descriptive Information instead of "Ours"/"Theirs" [message #1852743 is a reply to message #1852738]

Thu, 02 June 2022 15:15

Thomas Wolf

Messages: 576
Registered: August 2016

Senior Member

I assume you are referring to the "Replace With" context menu available in the package/project explorer, or in the Git Staging view, or in an editor opened on a conflicting file.

What exactly are the menu labels that you see? What EGit version are you using?

EGit 6.1 should normally show something like "Ours: <Commit id> <Shortened commit message title>", and likewise for "Theirs". Is that not good enough?

Report message to a moderator