Part 5!
Oy I went over my 10 minute time limit and had to split this video into two. (I don't say OY because I'm Jewish, I'm not, I know you care)
Having merge conflicts can be one of the scariest things in git especially if you're new. The wrong combination/work flow could erase someone's code and potentially result in tar and or feathering. (I suggest you quit your company if this could potentially happen)
These two videos detail two different ways of dealing with merge conflicts (The two parts are shown in part 5)
As always if you all have any questions or comments feel free to ask.
Colors:
git config color.ui true
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
gre3ns0ul 3 months ago
@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!
thejacenxpress 3 months ago