I got a problem with using git.Sometimes I pull from some branch(generally master) ,I got whole file conflicts(many src files,quite a mess,especially in STS).I guess it may be related to CRLF settings.So,I try to change related settings about CRLF.
Team:
Guy A:
MAC OS,autocrlf=input, STS : workspace new text line delimiter = unix
Guy B,C:
Win7,autocrlf true->false ,safecrlf:true,STS : workspace new text line delimiter = unix
Here is how I use git after finishing coding:
- git status
- git add .
- git commit -m "something"
- git pull origin master
- (after solving conflicts) git push
- use master branch to merge my commit
now it seems the problem has been solved.However,it's kind of weird to make everyone who use windows to change their default settings.With SVN, there is no such problem.
So, what is the best solution in this situation?Could you please share some better strateges and advice about using git?Thanks for any help and apologize for my poor English.