Checkout conflict
xinyuan-liu opened this issue · 0 comments
Exception caught while checking out:
org.eclipse.jgit.api.errors.JGitInternalException: Checkout conflict with file: assets/i18nmod/asset_map/asset_map.json
at org.eclipse.jgit.api.CheckoutCommand.checkoutPath(CheckoutCommand.java:556) ~[CheckoutCommand.class:?]
at org.eclipse.jgit.api.CheckoutCommand.access$3(CheckoutCommand.java:550) ~[CheckoutCommand.class:?]
at org.eclipse.jgit.api.CheckoutCommand$2.apply(CheckoutCommand.java:541) ~[CheckoutCommand$2.class:?]
at org.eclipse.jgit.dircache.DirCacheEditor.applyEdits(DirCacheEditor.java:179) ~[DirCacheEditor.class:?]
at org.eclipse.jgit.dircache.DirCacheEditor.finish(DirCacheEditor.java:132) ~[DirCacheEditor.class:?]
at org.eclipse.jgit.dircache.BaseDirCacheEditor.commit(BaseDirCacheEditor.java:276) ~[BaseDirCacheEditor.class:?]
at org.eclipse.jgit.dircache.DirCacheEditor.commit(DirCacheEditor.java:125) ~[DirCacheEditor.class:?]
at org.eclipse.jgit.api.CheckoutCommand.checkoutPathsFromCommit(CheckoutCommand.java:547) ~[CheckoutCommand.class:?]
at org.eclipse.jgit.api.CheckoutCommand.checkoutPaths(CheckoutCommand.java:458) ~[CheckoutCommand.class:?]
at org.eclipse.jgit.api.CheckoutCommand.call(CheckoutCommand.java:211) ~[CheckoutCommand.class:?]
at org.cfpa.i18nupdatemod.git.ResourcePackRepository.sparseCheckout(ResourcePackRepository.java:173) ~[ResourcePackRepository.class:?]
at org.cfpa.i18nupdatemod.download.RepoUpdateManager.lambda$start$0(RepoUpdateManager.java:119) ~[RepoUpdateManager.class:?]
at java.lang.Thread.run(Unknown Source) [?:1.8.0_201]
Caused by: java.io.IOException: Could not rename file C:\Users\liuxinyuan\AppData\Roaming\I18nUpdateMod\I18nRepo\assets\i18nmod\asset_map._asset_map.json8804871391854410840.tmp to C:\Users\liuxinyuan\AppData\Roaming\I18nUpdateMod\I18nRepo\assets\i18nmod\asset_map\asset_map.json
at org.eclipse.jgit.dircache.DirCacheCheckout.checkoutEntry(DirCacheCheckout.java:1545) ~[DirCacheCheckout.class:?]
at org.eclipse.jgit.api.CheckoutCommand.checkoutPath(CheckoutCommand.java:553) ~[CheckoutCommand.class:?]
... 12 more
Caused by: java.io.IOException: Could not rename file C:\Users\liuxinyuan\AppData\Roaming\I18nUpdateMod\I18nRepo\assets\i18nmod\asset_map._asset_map.json8804871391854410840.tmp to C:\Users\liuxinyuan\AppData\Roaming\I18nUpdateMod\I18nRepo\assets\i18nmod\asset_map\asset_map.json
at org.eclipse.jgit.util.FileUtils.rename(FileUtils.java:330) ~[FileUtils.class:?]
at org.eclipse.jgit.dircache.DirCacheCheckout.checkoutEntry(DirCacheCheckout.java:1543) ~[DirCacheCheckout.class:?]
at org.eclipse.jgit.api.CheckoutCommand.checkoutPath(CheckoutCommand.java:553) ~[CheckoutCommand.class:?]
... 12 more