Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » How to retrieve merge conflict info using conflicting files (How to retrieve merge conflict info using conflicting files returned by JGit Status)
How to retrieve merge conflict info using conflicting files [message #1847030] Tue, 12 October 2021 16:41
ABDUR BILLAH is currently offline ABDUR BILLAHFriend
Messages: 1
Registered: August 2021
Junior Member
Hi Experts,

I need to get merge conflict info using JGit Status . JGit Status returns the list of conflicting files; however, I need the number of conflict in each file. I wonder whether there is any API that can give me this information using the conflicting file.
Here is the UseCase
# Got into merge conflicts when trying to merge (Recursive) using JGit API.
# I have the numberOfConflicts in each file available from MergeResults. (so far so good)
# However, I did not resolve my conflicts at the moment and got logged out as a result all merge conflict info got lost.
# I logged back and ran the status and got hold of the conflicting files as
Status status = mGit.status().call();
conflictedFiles = status.getConflicting();
# Question: Is there any way to retrieve the numberOfConflicts in each of the conflicted files above (conflictedFiles) using JGit APIs?

Thank you very much.

-Abdur
Previous Topic:Performing RevWalk on repo without downloading entire repo
Next Topic:Missing the EGIT Menu Items
Goto Forum:
  


Current Time: Tue Sep 27 18:39:16 GMT 2022

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

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

Back to the top