Eclipse Community Forums: EGit / JGit » List stash apply conflicts in JGit

Help

Home

Home » Eclipse Projects » EGit / JGit » List stash apply conflicts in JGit

Show: Today's Messages :: Show Polls :: Message Navigator

List stash apply conflicts in JGit [message #1743344]

Wed, 14 September 2016 13:51

Vlad Acretoaie

Messages: 95
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

Report message to a moderator

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

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Thu Apr 25 11:09:27 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter