-
-
Notifications
You must be signed in to change notification settings - Fork 29
Open
Labels
Description
Auto Reported Issue
BowlerStudio Build 3.3.2
BowlerKernel 1.59.0
JavaCad Version: 2.1.1
Java-Bowler Version: 3.34.0
Java Version: 1.8.0_412
JavaFX Version: 8.0.412
OS = Linux amd64 x64
java.lang.RuntimeException: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:
GearGenerator.groovy
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.openGit(ScriptingEngine.java:458)
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.pull(ScriptingEngine.java:1449)
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.pull(ScriptingEngine.java:1560)
at com.neuronrobotics.bowlerstudio.BowlerStudioMenuWorkspace.lambda$loginEvent$0(BowlerStudioMenuWorkspace.java:64)
at java.lang.Thread.run(Thread.java:750)
Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:
GearGenerator.groovy
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:419)
at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:374)
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.lambda$pull$8(ScriptingEngine.java:1462)
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.openGit(ScriptingEngine.java:455)
... 4 more
Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files:
GearGenerator.groovy
at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(DirCacheCheckout.java:502)
at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:467)
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:288)
... 7 more
Caught and reported at:
java.lang.Exception
at com.neuronrobotics.bowlerstudio.IssueReportingExceptionHandler.except(IssueReportingExceptionHandler.java:234)
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.openGit(ScriptingEngine.java:463)
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.pull(ScriptingEngine.java:1449)
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.pull(ScriptingEngine.java:1560)
at com.neuronrobotics.bowlerstudio.BowlerStudioMenuWorkspace.lambda$loginEvent$0(BowlerStudioMenuWorkspace.java:64)
at java.lang.Thread.run(Thread.java:750)
IssueReportingExceptionHandler Created at:
java.lang.Exception
at com.neuronrobotics.bowlerstudio.IssueReportingExceptionHandler.<init>(IssueReportingExceptionHandler.java:41)
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.openGit(ScriptingEngine.java:463)
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.pull(ScriptingEngine.java:1449)
at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.pull(ScriptingEngine.java:1560)
at com.neuronrobotics.bowlerstudio.BowlerStudioMenuWorkspace.lambda$loginEvent$0(BowlerStudioMenuWorkspace.java:64)
at java.lang.Thread.run(Thread.java:750)