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

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

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

Thu, 02 June 2022 09:10

Eclipse User

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

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

Thu, 02 June 2022 11:15

Eclipse User

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?

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

Fri, 03 June 2022 06:16

Eclipse User

Thank you for your quick response,
we are currently on EGit 5.12; I need to verify if this has already improved with EGit 6.1

Previous Topic:	Remote hung up unexpectedly on clone repository
Next Topic:	File Property Set & Read API in Jgit equivalent to SVN's SvnSetProperty

Goto Forum:

-=] Back to Top [=-

Current Time: Mon May 12 21:20:36 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter