1
0
-1

I added a git config in my project it worked well for a day. After which I started to get an error.


ERROR 26 May 2020 05:51:33 org.joget.apps.app.service.AppServiceImpl - jwc_rushiharal1 : Error sync app {id=vms, version=1, published=true}
2889org.eclipse.jgit.api.errors.WrongRepositoryStateException: Cannot pull into a repository with state: MERGING_RESOLVED
2890    at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:244)
2891    at org.joget.apps.app.service.AppDevUtil.gitPull(AppDevUtil.java:491)
2892    at org.joget.apps.app.service.AppDevUtil.fileGetFileObject(AppDevUtil.java:974)
2893    at org.joget.apps.app.service.AppDevUtil.dirSyncApp(AppDevUtil.java:1369)
2894    at org.joget.apps.app.service.AppServiceImpl.loadAppDefinition(AppServiceImpl.java:1147)
2895    at org.joget.apps.app.service.AppServiceImpl.getAppDefinition(AppServiceImpl.java:1114)
2896    at jdk.internal.reflect.GeneratedMethodAccessor1314.invoke(Unknown Source)
2897    at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
2898    at java.base/java.lang.reflect.Method.invoke(Method.java:566)
2899    at org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:333)
2900    at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:207)
2901    at com.sun.proxy.$Proxy77.getAppDefinition(Unknown Source)
2902    at org.joget.apps.ext.ConsoleWebPlugin.getAppInfo_aroundBody64(ConsoleWebPlugin.java:515)
2903    at org.joget.apps.ext.ConsoleWebPlugin.getAppInfo_aroundBody65$advice(ConsoleWebPlugin.java:48)
2904    at org.joget.apps.ext.ConsoleWebPlugin.getAppInfo_aroundBody66(ConsoleWebPlugin.java:1)
2905    at org.joget.apps.ext.ConsoleWebPlugin.getAppInfo_aroundBody67$advice(ConsoleWebPlugin.java:99)
2906    at org.joget.apps.ext.ConsoleWebPlugin.getAppInfo(ConsoleWebPlugin.java:1)
2907    at org.joget.apps.app.controller.ConsoleWebController.checkVersionExist(ConsoleWebController.java:5363)
2908    at org.joget.apps.app.controller.ConsoleWebController.consoleFormList(ConsoleWebController.java:3716)
2909    at org.joget.apps.app.controller.ConsoleWebController$$FastClassBySpringCGLIB$$e1402d89.invoke(<generated>)
2910    at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:204)
2911    at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:667)
2912    at org.joget.apps.app.controller.ConsoleWebController$$EnhancerBySpringCGLIB$$6916644f.consoleFormList(<generated>)
2913    at jdk.internal.reflect.GeneratedMethodAccessor2015.invoke(Unknown Source)
    CommentAdd your comment...

    1 answer

    1.  
      1
      0
      -1

      Hi, what version of Joget are you running? I believe there has been some updates in the latest DX releases.

      1. Punam

        Hi, I am using joget on the cloud  

      CommentAdd your comment...