Ask the submitter to pull master back into their branch, and push again. That will bring it back together, and will also put the burden of resolving any conflicts between their branch and the rest of the project.
Walter
> On Jan 28, 2019, at 5:59 PM, Jason Hsu <jhsu802701@gmail.com> wrote:
>
> I'm on the RailsBridge Bridge Troll project at https://github.com/railsbridge/bridge_troll. I am NOT a collaborator. My fork is at https://github.com/jhsu802701/bridge_troll.
>
> Someone else submitted a pull request that is now lagging several commits behind the upstream master branch. This pull request is at https://github.com/railsbridge/bridge_troll/pull/580.
>
> How do I sync up the branch behind this pull request?
>
> --
> You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to rubyonrails-talk+unsubscribe@googlegroups.com.
> To post to this group, send email to rubyonrails-talk@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/rubyonrails-talk/a571effe-1895-45cf-805a-cd07ff541f0a%40googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
--
You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rubyonrails-talk+unsubscribe@googlegroups.com.
To post to this group, send email to rubyonrails-talk@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/rubyonrails-talk/93277661-94D3-43F4-82AD-C5416C7FAD6A%40wdstudio.com.
For more options, visit https://groups.google.com/d/optout.
No comments:
Post a Comment