Re: ERROR: Failed to push merge to origin repository

2016-03-02 Thread Mark Waite
In the job definition page, check that the "Advanced" section of the git repositories you're referencing have at least one of them whose "Name" is "origin". The default is "origin", but evolution of job definitions sometimes leaves a "Name" as something other than "origin". Mark Waite On Wed, Ma

ERROR: Failed to push merge to origin repository

2016-03-02 Thread Niels Muysewinkel
Can anyone give me any pointers on how to resolve this issue? What we are trying to do is merge 2 branches in our git repo into a third branch and afterwards deploy changes to that branch to salesforce. I seems to merge the branches and then fails to push to git. Any help is kindly appreciated! P