com.atlassian.stash.scm.MergeException

New changes were pushed to master in PROJECT/repo while the merge was being performed. Please retry the merge.

Samebug tips0

We couldn't find tips for this exception.

Don't give up yet. Paste your full stack trace to get a solution.

Solutions on the web6

  • via Unknown by Alexey Efimov,
  • via Unknown by Alexey Efimov,
  • via Unknown by Alexey Efimov,
  • Stack trace

    • com.atlassian.stash.scm.MergeException: New changes were pushed to master in PROJECT/repo while the merge was being performed. Please retry the merge. at com.atlassian.stash.internal.scm.git.merge.MergeCommand.newMergeException(MergeCommand.java:138)[na:na] at com.atlassian.stash.internal.scm.git.merge.MergeCommand.doWithWorkTree(MergeCommand.java:116)[na:na] at com.atlassian.stash.internal.scm.git.merge.MergeCommand.doWithWorkTree(MergeCommand.java:29)[na:na] at com.atlassian.stash.internal.scm.git.porcelain.AbstractWorkTreeCommand.call(AbstractWorkTreeCommand.java:38)[na:na] at com.atlassian.stash.internal.pull.PullRequestServiceImpl$MergeAndUpdatePullRequestOperation.perform(PullRequestServiceImpl.java:1721)[stash-service-impl-2.9.1.jar:na] at com.atlassian.stash.internal.pull.PullRequestServiceImpl$MergeAndUpdatePullRequestOperation.perform(PullRequestServiceImpl.java:1693)[stash-service-impl-2.9.1.jar:na] at com.atlassian.stash.internal.concurrent.DefaultLockService.doWithLock(DefaultLockService.java:77)[stash-service-impl-2.9.1.jar:na] at com.atlassian.stash.internal.concurrent.DefaultLockService.doWithLock(DefaultLockService.java:64)[stash-service-impl-2.9.1.jar:na] at com.sun.proxy.$Proxy162.doWithLock(Unknown Source)[na:na] at com.atlassian.stash.internal.pull.PullRequestServiceImpl.merge(PullRequestServiceImpl.java:623)[stash-service-impl-2.9.1.jar:na] at com.sun.proxy.$Proxy171.merge(Unknown Source)[na:na] at com.sun.proxy.$Proxy245.merge(Unknown Source)[na:na] at com.sun.proxy.$Proxy516.merge(Unknown Source)[na:na] at com.atlassian.stash.internal.rest.pull.PullRequestResource.mergePullRequest(PullRequestResource.java:423)[stash-rest-2.9.1.jar:na] at com.atlassian.applinks.core.rest.context.ContextFilter.doFilter(ContextFilter.java:25)[applinks-plugin-4.0.5_1384476184000.jar:na] at com.atlassian.stash.internal.spring.security.StashAuthenticationFilter.doFilter(StashAuthenticationFilter.java:90)[StashAuthenticationFilter.class:na] at com.atlassian.stash.internal.web.auth.BeforeLoginPluginAuthenticationFilter.doInsideSpringSecurityChain(BeforeLoginPluginAuthenticationFilter.java:111)[BeforeLoginPluginAuthenticationFilter.class:na] at com.atlassian.stash.internal.web.auth.BeforeLoginPluginAuthenticationFilter.doFilter(BeforeLoginPluginAuthenticationFilter.java:77)[BeforeLoginPluginAuthenticationFilter.class:na] at com.atlassian.security.auth.trustedapps.filter.TrustedApplicationsFilter.doFilter(TrustedApplicationsFilter.java:100)[atlassian-trusted-apps-core-3.0.2.jar:na] at com.atlassian.oauth.serviceprovider.internal.servlet.OAuthFilter.doFilter(OAuthFilter.java:61)[atlassian-oauth-service-provider-plugin-1.9.0-m3_1384476184000.jar:na] at com.atlassian.stash.internal.web.auth.BeforeLoginPluginAuthenticationFilter.doBeforeBeforeLoginFilters(BeforeLoginPluginAuthenticationFilter.java:89)[BeforeLoginPluginAuthenticationFilter.class:na] at com.atlassian.stash.internal.web.auth.BeforeLoginPluginAuthenticationFilter.doFilter(BeforeLoginPluginAuthenticationFilter.java:75)[BeforeLoginPluginAuthenticationFilter.class:na] at com.atlassian.stash.internal.request.DefaultRequestManager.doAsRequest(DefaultRequestManager.java:72)[stash-service-impl-2.9.1.jar:na] at java.lang.Thread.run(Thread.java:662)[na:1.6.0_45]

    Write tip

    You have a different solution? A short tip here would help you and many other users who saw this issue last week.

    Users with the same issue

    We couldn't find other users who have seen this exception.