Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
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 13:10 Go to next message
Ernst Blecha is currently offline Ernst BlechaFriend
Messages: 13
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
Re: Feature Wish: more descriptive Information instead of "Ours"/"Theirs" [message #1852743 is a reply to message #1852738] Thu, 02 June 2022 15:15 Go to previous messageGo to next message
Thomas Wolf is currently offline Thomas WolfFriend
Messages: 497
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?
Re: Feature Wish: more descriptive Information instead of "Ours"/"Theirs" [message #1852768 is a reply to message #1852743] Fri, 03 June 2022 10:16 Go to previous message
Ernst Blecha is currently offline Ernst BlechaFriend
Messages: 13
Registered: December 2019
Junior Member
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:Future expectations for https://git.eclipse.org/c/egit/egit-github.git/
Goto Forum:
  


Current Time: Thu Oct 06 08:38:17 GMT 2022

Powered by FUDForum. Page generated in 0.02364 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top