Alert icon
We're changing our privacy policy. This stuff matters.  Learn more  Dismiss

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

Loading...

Sign in or sign up now!
Alert icon
Upgrade to the latest Flash Player for improved playback performance. Upgrade now or more info.
952 views
Loading...
Alert icon
Sign in or sign up now!
Alert icon

Uploaded by on Oct 30, 2011

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

Category:

Howto & Style

Tags:

License:

Standard YouTube License

  • likes, 0 dislikes

Link to this comment:

Share to:

Uploader Comments (thejacenxpress)

  • 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 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!

see all

All Comments (3)

Sign In or Sign Up now to post a comment!
  • Thanks did my first merge!

Loading...

Alert icon
0 / 00Unsaved Playlist Return to active list
    1. Your queue is empty. Add videos to your queue using this button:
      or sign in to load a different list.
    Loading...Loading...Saving...
    • Clear all videos from this list
    • Learn more