Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » List stash apply conflicts in JGit
List stash apply conflicts in JGit [message #1743344] Wed, 14 September 2016 13:51
Vlad Acretoaie is currently offline Vlad AcretoaieFriend
Messages: 93
Registered: April 2014
Member
I am using the StashApplyCommand class to apply stashed commits to the working tree. In case conflicts occur, the call() method of this class throws a StashApplyFailureException.

However, I can't find a way to retrieve the list of conflicts. Unlike the MergeCommand, the StashApplyCommand does not return this list as part of the return value of the call() method.

Is it at all possible to retrieve the conflicts caused by a stash apply in JGit?

Thanks in advance!

Vlad
Previous Topic:eclipse project with git externals
Next Topic:Incorrect Merge by EGIT
Goto Forum:
  


Current Time: Thu May 25 03:27:50 GMT 2017

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

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