Does Bitbucket handle the fast-forward of branches or will my merge revert the files that are out of sync from master?
Hello @Lynnard Mondigo ,
Do you mean some clashing changes in the PR source branch and in the target branch? You'll see conflicts for those files in that case, Bitbucket won't let you merge that PR until you resolve them.
Let me know if I got you wrong.
Cheers,Daniil
Hi @Daniil Penkin
Not clashing per se. Let's say for example a PR that has been created few days ago has changes in File A but do not conflict with the current master. However, the PR is 10 commits behind (changes to Files B, C, D).
The question is, when I merge the PR, is the PR fastforwarded in the background? Will only the File A on master branch be affected?
Fast-forward will not work in this case, e.g. if you select fast-forwar only, PR merge will fail. This is because fast-forward is only possible when target branch has not changed since common merge base (since you branched off it).
You can merge the PR you described using a merge commit. Only file A will be updated on the master branch, just like it was on the PR source branch. So, in the end changes to all files A, B, C and D will appear in master.
Note that master could've had changes to file A too, but you'll be able to merge a PR only if such changes don't clash with the changes in that PR, e.g. if they're in different chunks of the file. Also, as described in this nice blog post, what Bitbucket shows you in PR UI is the future result of merging. So you will see potential changes to the same files done in the target branch on context lines.
Does this make sense?
It makes sense now and I've tried it out also using test repos. You have mentioned using a merge commit. How about a squash commit? Will it have the same result aside from all commits in the PR being squashed into one?
It looks like you're new here. Sign in or register to get started.
