GSMCD/Arduino — pull request #3 by GSMCD (2014-02-20 18:40:44+00:00)
Title: Other Stuff I added

this is glenn being pulled into master. theres no conflicting changes, so it does it automatically..

i cant think of a way to make it have a conflict. but if you work on a project where multiple people change the same file, it happens.

when it does, it tells you theres a conflict and you pull the latest using the command line, and it tells you what file.

when you open the file it looks like that. its got the <<< and >> to show you where the conflict is.

if you added that code, then delete the arrows and text and save+commit it and it will merge for you.

if you delete that code, and its there because someone commited it before you delete it but your happy to get rid of it, delete everthing in the gap and commit it and it will merge for you.

dont forget to push after you commit, and then pull it again to make sure you pull down thhe newly merged code as the merge doesnt happen locally, its done on the repo at github end

all good? Yeah, makes perfect sense thanks

euveiviebvebrv
vekvbieurbvierbivbervbrbe();
<<<<<<<<<
HEAD

function newfunct(){

}

master
>>>>>>>>>