From: fhaehnel <fhaehnel@atlassian.com>
To: git@vger.kernel.org
Subject: Re: Question about pull-requests
Date: Mon, 22 Feb 2016 19:58:35 -0700 (MST) [thread overview]
Message-ID: <1456196315828-7648733.post@n2.nabble.com> (raw)
In-Reply-To: <CAOh0v-WW=hOXw=uTdzkd3afzXCguBHWdaDShwKE3QKqUCOBTzg@mail.gmail.com>
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.
prev parent reply other threads:[~2016-02-23 3:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 11:54 Question about pull-requests Nagaraj Mandya
2016-02-22 16:37 ` Kevin Daudt
2016-02-22 21:37 ` Jeff King
2016-02-23 2:58 ` fhaehnel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456196315828-7648733.post@n2.nabble.com \
--to=fhaehnel@atlassian.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).