Core Spring Data
Written by: Oliver Gierke
Featured Refcardz: Top Refcardz:
  1. Git
  2. Prep for CD
  3. DNS
  4. Data Mining
  5. Spring Data
  1. Data Mining
  2. Spring Data
  3. DNS
  4. Machine Learning
  5. MongoDB

Link Details

Link 936785 thumbnail
User 1122163 avatar

By seyz
via baboon-project.org
Published: Mar 12 2013 / 10:03

One single merge conflict is pretty easy to solve. However, you might take several days before realizing there is one conflict. The longer you wait, the more conflicts you will have to solve. Overlooking them will lead you to a merge hell. Baboon is a lightweight daemon that detects merge conflicts in realtime.
  • 4
  • 0
  • 303
  • 376

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



Voters Against This Link (0)