Hi,
Im trying to great a PR from VSTS (since they are no yet supported : Pull Request support for AzureDevOps (VSTS))
A PR build will be triggered in Bitirse using the api when needed. the api request will look like this :
{
"hook_info": {
"type": "bitrise",
"build_trigger_token": "..."
},
"build_params": {
"branch": "feature/testPr",
"workflow_id": "ci",
"branch_dest": "develop",
"pull_request_id": 12345,
}
}
That 'c’i workflow works without any problem with a simple trigger (in the dashboard or even in the api when branch_dest & pull_request_id are not passed ).
But following that request this is the result : it’s obviously a merge issue, but that feature/testPr branch have minimal change and it merge gracefully with develop without any problem in my machine.
git "init"
Initialized empty Git repository in /Users/vagrant/git/.git/
git "remote" "add" "origin" "myorganization@vs-ssh.visualstudio.com:v3/myorganization/myproject/myrepo"
git "fetch" "origin" "develop"
Warning: Permanently added 'vs-ssh.visualstudio.com,XX.XX.XX.XX' (RSA) to the list of known hosts.
From vs-ssh.visualstudio.com:v3/myorganization/myproject/myrepo
* branch develop -> FETCH_HEAD
* [new branch] develop -> origin/develop
git "checkout" "develop"
Switched to a new branch 'develop'
Branch 'develop' set up to track remote branch 'develop' from 'origin'.
Already up to date.
commit hash: 123c....8
git "fetch" "origin" "feature/testPr"
Warning: Permanently added 'vs-ssh.visualstudio.com,XX.XX.XX.XX' (RSA) to the list of known hosts.
From vs-ssh.visualstudio.com:v3//myorganization/myproject/myrepo
* branch feature/testPr -> FETCH_HEAD
* [new branch] feature/testPr -> origin/feature/testPr
git "merge" ""
merge: - not something we can merge
ERROR: manual merge, error: merge failed (), error: exit status 1
I tried to alternate Manual merge
setting between yes and no but ti fails anyway : (the following is when is set to yes)
git "init"
Initialized empty Git repository in /Users/vagrant/git/.git/
git "remote" "add" "origin" "myorganization@vs-ssh.visualstudio.com:v3/myorganization/myproject/myrepo"
git "fetch" "origin" "develop"
Warning: Permanently added 'vs-ssh.visualstudio.com,XX.XX.XX.XX' (RSA) to the list of known hosts.
commit hash: 123c....8
git "fetch" "origin" "feature/testPr"
Warning: Permanently added 'vs-ssh.visualstudio.com,65.52.8.37' (RSA) to the list of known hosts.
From vs-ssh.visualstudio.com:v3//myorganization/myproject/myrepo
* branch feature/testPr -> FETCH_HEAD
* [new branch] feature/testPr -> origin/feature/testPr
git "merge" ""
merge: - not something we can merge
ERROR: manual merge, error: merge failed (), error: exit status 1
Any idea how I can make this work ?