Jump to content

Merging Origin master


Guest godhimself
 Share

Recommended Posts

you can use 'git rebase' that way your patch is always on the top. honestly i haven't known that 'back then when i started', so i used 'git pull' -> i get merge errors too from time to time. then there's only one thing to do: open it in a text editor and go through it and fix it.

Link to comment
Share on other sites

 Share

×
×
  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use