How to use Git - Git Video Tutorial - Part 5 (More Merge Conflicts)

[javawocky]

Thanks did my first merge!

[gre3ns0ul]

great videos man, they help me a lot.

After this command line stage, imagine than i have a big project in eclipse, how can i manage this more easy without being typing all the commands..?

You use some git gui for this?

Thanks

[thejacenxpress]

@gre3ns0ul Thanks for the comment! I have a buddy who uses a git plugin for eclipse (He's not too much into command line). I've never used it before mainly because of the simplicity of the command line itself. Keep in mind that the command line with gitk (type gitk) is enough for most. He does complain that when he has conflicts he has to do a lot more work-around to achieve the same stuff. I've been on projects with nearly 400 files using git and it worked perfectly with 6 devs!