HTML5 Canvas
Written by: Simon Sarris
Featured Refcardz: Top Refcardz:
  1. Apache Hadoop
  2. Web Driver
  3. MVVM
  4. REST
  5. ADO.NET
  1. HTML5
  2. Ajax
  3. jQuery Selectors
  4. CSS Part 1
  5. Git
150+ Refcardz Available · Get them all

Link Details

Previous | Next

Surprise Me!
Link 199009 thumbnail
User 410289 avatar

By CodeJustin
via blog.experimentalworks.net
Published: Jul 04 2009 / 18:41

Merge vs. Rebase - A deep dive into the mysteries of revision control
I remember the days when I started learning Git about two years ago. I crawled through all the available commands and read the man pages what they are for and I remember when I stumbled over rebase and stuck. After figuring out what it actually does, I start loving it, but didn’t understand it’s dangerousness until someday I somehow got duplicated commits after pulling from another repository. So let me explain what goes wrong and why merge and rebase are often misunderstood. I’ll also present a list of golden-rules about their usage. Before we start with explaining both commands, I would like to give you one of the most important rules, in case you don’t want to read the complete article.
Vote up
Vote down
  • 13
  • 0
  • 1309
  • 0
SaveShareSend Tags:

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 (13)



Voters Against This Link (0)