So I am using GIT as my source control, and when I did a git pull origin there were some conflicts, 2 of them auto-merged and the 3rd one's merge couldn't be done automatically. The message git gave me is: [code]git automatic merge fa ...

I create a .gitignore file in my repository so I can exclude certain files/folders like the /bin folder and /obj folder that .net creates. I'm not sure I placed the file in the correct folder, but when I do a: [code]git status[/code] ...

For some reason there seems to be a shift to GIT from subversion (at least a trend!). What are the main differences between the two source control systems? Is GIT more well suited for only distributing or large scale development house ...