Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Excluding a file during pull request

Shadab_Faiz September 6, 2019

This is our scenario:

We have bitbucket-piplines.yml in our development branch. All the developers have read access to it. A developer created a separate branch, edited the bitbucket-pipline.yml along with other changes and created a pull request. Now during pull request, we want to discard the changes to the bitbucket-pipeline.yml file. I assume this can be done by adding this file to repository's pull request exclude File setting.

But, when we merge the development branch into the master branch through the pull request, we want the bitbucket-pipeline.yml file to be merged with the changes if any changes have been made to that file in the development branch.

1 answer

0 votes
Julius Davies _bit-booster_com_
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
September 6, 2019

 

The developer needs to discard their change before they commit & push & create their pull request, like so:

git checkout origin/develop -- bitbucket-piplines.yml

(That command resets "bitbucket-piplines.yml" to be identical to the version in origin/develop at that moment).

They can easily update their pull-request using that command and then pushing the result to their PR's source branch.

Shadab_Faiz September 8, 2019

That's what we normally do. But sometimes developers forget to checkout the file and reviewer accept the pull request. We want to avoid it.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events