GIT Conflict new version

14 views

Skip to first unread message

Benjamin Mewes

unread,

Nov 30, 2015, 3:21:18 AM11/30/15

to GAMA

Hi all,

do you also have problems to get the new GIT version of GAMA? I get the following error:

org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:
msi.gama.application/gama1.7.Eclipse3_8_2.product

    at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:406)

    at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:313)

    at org.eclipse.egit.core.op.PullOperation$1.run(PullOperation.java:97)

    at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2313)

    at org.eclipse.egit.core.op.PullOperation.execute(PullOperation.java:128)

    at org.eclipse.egit.ui.internal.pull.PullOperationUI.execute(PullOperationUI.java:139)

    at org.eclipse.egit.ui.internal.pull.PullOperationUI$1.runInWorkspace(PullOperationUI.java:114)

    at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38)

    at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)

Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files:
msi.gama.application/gama1.7.Eclipse3_8_2.product

    at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(DirCacheCheckout.java:413)

    at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:394)

    at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:286)

    ... 8 more

Any ideas?

Benjamin Mewes

unread,

Dec 1, 2015, 3:02:53 AM12/1/15

to GAMA

A clean copy from GIT solved my problems.

Reply all

Reply to author

Forward

0 new messages