|How to retrieve merge conflict info using conflicting files [message #1847030]
||Tue, 12 October 2021 16:41
| ABDUR BILLAH
Registered: August 2021
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.
Powered by FUDForum
. Page generated in 0.02952 seconds