Re: Question about pull-requests

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



>From your message I’m guessing you are using Bitbucket Server with branch
permissions [1]. 
We’re aware the conflict resolution instructions can not always be followed.
Improving these is on our backlog
(https://jira.atlassian.com/browse/BSERV-7561) - feel free to watch/vote for
that issue. 

First, let’s start with the most basic case: a pull request you created is
conflicted and can’t be merged. 
Here, you can apply Jeff King’s solution and back-merge the target branch.
Alternatively, you can, of course, rebase the branch too. (Check out
https://www.atlassian.com/git/tutorials/merging-vs-rebasing for more info on
which option to pick and when).

If you are using cascading merges [2] in Bitbucket Server, there’s a chance
of conflicts during the merge-cascade, which will generate “Automatic merge
failures”.
If this happens, Bitbucket will create a new pull request on your behalf.
The same strategy as above can be applied: merge the target branch and
resolve the conflicts, or rebase.


[1]
https://confluence.atlassian.com/bitbucketserver/using-branch-permissions-776639807.html
[2]
https://confluence.atlassian.com/bitbucketserver/automatic-branch-merging-776639993.html

- Felix



--
View this message in context: http://git.661346.n2.nabble.com/Question-about-pull-requests-tp7648649p7648733.html
Sent from the git mailing list archive at Nabble.com.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]