im beginner @ using git. working on project using 2 work computer , home pc, saving code github go. when make changes on 1 computer , want update project on other pc fetching github, tends screw up.
here happens. used 'git fetch origin' work pc try update local repository. when load project, code has these lines of text this:
<<<<<<< head // code >>>>>>> 55ef9f7e76d0f27b0fc7f5ca533ccccd07550e8f so doesnt compile , have manually go through , delete lines. way have found update code create new project each time, tedious. so, doing wrong? why fetch add lines code
this git merge conflict. remote , local versions of source files, both have changed same file. git marks change local head first
<<<<<< head changes ======= remote changes >>>> you have edit file manually , resolve conflict. see how to.
