Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,299,262
Community Members
 
Community Events
165
Community Groups

Why does a bitbucket pipeline on one branch try to merge with a commit from another branch

Edited

We have a build that failed with the following log during the "Build Setup" step:
```
+ git reset --hard 38167b31fd00
HEAD is now at 38167b3 DAT-2701: fix some thing

+ git config user.name bitbucket-pipelines
+ git config user.email commits-noreply@bitbucket.org
+ git config push.default current
+ git config http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy http://localhost:29418/

+ git remote set-url origin http://bitbucket.org/datylon/daty-vizlib
+ CONFLICT_EXIT_CODE=3
+ git merge 263e287ee12d --no-edit || exit $CONFLICT_EXIT_CODE
warning: Cannot merge binary files
```

38167b3 is the head of a feature branch.  263e287ee12d is a merge of that feature branch with our release branch.

So why does the pipeline setup for the feature branch merges in a commit that was made later?

3 answers

We enountered the same problem. Our expectation was that the Pull Request build executes on the branch the pull request is from, and we don't want the build to use anything from the destination branch.

@Graham GatusThanks for the tip on using "branches" pattern, but this requires us to enforce using patterns when we create branches (e.g. /feature/...).

Seems Bit Bucket doesn't have any other option in this case and Pull Request pipelines becomes useless.

@Rutger Claes do you mind sharing a snippet from your bitbucket-pipelines.yml file?

It sounds like you have defined a pull-requests section in your bitbucket-pipelines.yml file.

If a branch matches the pattern defined for pull-requests, when a pull request is created, the destination branch will be merged with the source branch, and a pipeline run against the result. This can be used run tests against the potential result of a merge.

If you don't want this behaviour, instead of defining a pull-requests section, use a regular branches section instead. e.g:


pipelines:
default:
- step:
script:
- echo "This script runs on all branches that don't have any specific pipeline assigned in 'branches'."
branches:
feature/*:
- step:
script:
- echo "This script runs only on commit to branches with names that match the feature/* pattern."
pull-requests:
feature/*:
- step:
script:
- echo "This script runs only on commit to branches with names that match the feature/* pattern when a pull request is raised."

 

Why does it do this? If I wanted to update my branch with respect to the destination branch, I would do that myself.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

Git push size limits are coming to Bitbucket Cloud starting April 4th, 2022

Beginning on April 4th, we will be implementing push limits. This means that your push cannot be completed if it is over 3.5 GB. If you do attempt to complete a push that is over 3.5 GB, it will fail...

2,239 views 2 9
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you