clone PR branch instead of base/mainbranch

Open lorenzen-b1 opened this issue 5 years ago • 1 comments

It would be great if i could just checkout branch X without having to worry about wether the branch can be merged into the main branch.

Currently we run into issues when the PR branch differs too much or conflicts withe the main branch:

Initialized empty Git repository in /tmp/build/get/.git/
Switched to a new branch 'master'
Auto-merging A
CONFLICT (content): Merge conflict in A
Auto-merging A
Auto-merging B
Auto-merging C
Automatic merge failed; fix conflicts and then commit the result.
2020/07/02 09:27:23 get failed: merge failed: exit status 1

It should be possible to just checkout some branch when choosing integration_tool: checkout. Then we use the resource to just get $branch instead of having an integrated merge/rebase check.

Jul 02 '20 14:07 lorenzen-b1

I agree - we're being hit by this too! Any input @rickardl ?

Dec 20 '22 04:12 james-pollard-leapyear