Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build source org.eclipse.jgit.api.MergeCommand at line 419 #440

Open
madhephaestus opened this issue Jan 9, 2025 · 0 comments
Open

Build source org.eclipse.jgit.api.MergeCommand at line 419 #440

madhephaestus opened this issue Jan 9, 2025 · 0 comments
Assignees

Comments

@madhephaestus
Copy link
Member

Auto Reported Issue
BowlerStudio Build source
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

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$7(ScriptingEngine.java:1462)
	at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.openGit(ScriptingEngine.java:455)
	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$0(BowlerStudioMenuWorkspace.java:64)
	at java.lang.Thread.run(Thread.java:750)
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:457)
	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$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:42)
	at com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine.openGit(ScriptingEngine.java:457)
	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$0(BowlerStudioMenuWorkspace.java:64)
	at java.lang.Thread.run(Thread.java:750)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant