Editing Getting Your Pull Accepted (section)

== How to Deal with Merge Conflicts ==

Most of the time, Git is pretty smart about merging code files. However, if one PR is merged before yours that edits the same file, your PR will be in a state of conflict and will not be able to be automatically merged via GREEN BUTTON. Because there are more contributors than there are maintainers, most of the time resolving these conflicts falls to the maker of the PR.

An easy way to fix merge conflicts is to make a new branch (you should especially do this if your PR is just a small one):
# Switch to your master branch: Right-click your working folder, go '''TortoiseGit''' --> '''Git Switch/Checkout...'''
# Look at the '''Branch'''-list and select '''master'''
# Close the window that pops up (assuming it changed successfully)
# Right-click your working folder, go '''TortoiseGit''' --> '''Git Pull...'''
# On the top, from the '''Remote'''-list, select '''upstream''' and from the '''Remote Branch''' -list select '''master'''.
# Close the window that pops up (assuming it updated successfully)
# Make the same exact changes to the code which you have on your PR
# Commit and MAKE A NEW BRANCH
# Push your new branch to your PR branch, and tick '''Force: unknown changes'''


If it's a map file that's conflicted, remember to start the [[Map Merger]] before you pull from upstream.



{{Contribution guides}}
[[Category:Game Resources]] [[Category:Guides]]