Relative Content

Tag Archive for gitbitbucket

What is the internal workings of a BitBucket automatic merge failure pull request?

I came across an issue where someone deleted a BitBucket automatic merge failure request instead of resolving it. The when another person tried to merge their changes into master, they ended up getting a conflict PR with all the changes (and more) that the other person had in their deleted automatic merge failure PR. Does BitBucket create a branch when a merge conflict occurs? How does it keep track of the merge conflict that seems to remains when the automatic merge failure PR is deleted?

Old master branch out of sync

I have master branch for a repo in bitbucket which was last updated back in 2017.Now i have a task to sync the latest release branch with master and need to bring all code from release into master.