search

jpeterbaker / maxfield

Code for maximizing the Ingress fields on a given set fo portals
GNU General Public License v3.0
165 stars 56 forks source link

Resolve conflict in doc string #26

Closed sionleroux closed 9 years ago

sionleroux commented 9 years ago

Fixed an unresolved merge conflict which allowed git diff markers to be commited. These then went on to cause more merge conflicts later on. Unfortunately the way I solved this made the git log look like a bit of a pyramid but at least I think it shows clearly how this was solved.

sionleroux commented 9 years ago

Don't pull this! I just noticed fixing this caused another mistake.

sionleroux commented 9 years ago

All right, I just did a fix, feel free to merge this in and then things should be working much better!

sionleroux commented 9 years ago

As an explanation, if two people change the same file in the same place git can't be sure how to resolve it. This could happen if you have uncommited local changes and you pull down changes which you merged on GitHub, which is what I suspect happened here. Usually git is quite smart when it comes to resolving conflicts but when it can't you need to resolve them manually. It inserts the easily-searchable <<<<<<<, ======= and >>>>>>> markers into your file to show you where one person's changes start and the next one's end. You just need to re-arrange the code in the markers so it looks right then delete the markers and commit. You can read more about this here.

In our case, these markers were accidentally committed as part of the code and then the situation was exacerbated when attempting to merge other branches, not having the markers in the code, caused even more conflicts, hence even more markers in the code.

egor-n commented 9 years ago

:thumbsup: