Link Details

Link 966419 thumbnail
User 1127519 avatar

By jakubgarfield
via chodounsky.net
Submitted: May 09 2013 / 03:30

This article shows you how you can merge branches in git with git merge and how to use git mergetool for conflict resolution.
  • 2
  • 1
  • 86
  • 38

Add your comment


Html tags not supported. Reply is editable for 5 minutes. Use [code lang="java|ruby|sql|css|xml"][/code] to post code snippets.

Voters For This Link (1)



Voters Against This Link (1)



Debugging JavaScript
Written by: Ashutosh Sharma
Featured Refcardz: Top Refcardz:
  1. Design Patterns
  2. OO JS
  3. Cont. Delivery
  4. Java EE7
  5. HTML5 Mobile
  1. Java EE7
  2. Spring Annotations
  3. Git
  4. Java
  5. REST