scipy/scipy — comment on commit 11c2ea4733769130c1a86ad9fcfc81c741b82e5e
File:  line 0
By rgommers:

Have a look at "basic workflow" at http://docs.scipy.org/doc/numpy/dev/gitwash/development_workflow.html

If there are conflicts during merge (which you can see beforehand on PRs by the green merge button turning grey), just resolve them the normal way. Search for conflict markers `>>>>>>`, resolve them, do `git add relevant_files`, `git commit`.

Git always gives you an explanation of how to continue or abort too if there's a problem with merge or rebase.