Learn More
Resend Email
0
IronPhreak
8y

Completely noob question and before you say it, yes I have googled but I'm tired and I just get walls of text.

How do I merge a pull request?

A nice guy has submitted a pull request to my repository on GitHub, how can I merge it??

I tried what I thought was merging but it said that a file is conflicting. I tried deleting the file and it still didn't merge.

undefined

merge

github

pull request
Favorite
Ranter
Comments
  • 0
    8y
    you need to resolve conflicts, not delete files.
  • 0
    8y
    @kargaroth
    Hoped I didn't have to :P Never used it.
    Better late than never
  • 0
    8y
    You need to find out what changed, better yet let the submitter do it. Tell him/her to upstream pull first and then do the merge again. Don't fuck with your repo in the mean time.
  • 0
    8y
    be careful with conflicts, you can land yourself in a whole load of shit if you don't know what you are doing.
Related Rants
devRant © 2021 Hexical Labs LLC
Privacy Policy  |  Terms of Service
Add Comment