#git bot interface

History of !eekaconflict

• Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
  By ikke at 2014-03-04 18:00:12
• Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice!
  By EugeneKay at 2013-08-19 16:47:20
• Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts. Carefully go through the conflicts. Picking one side verbatim is not always the right choice!
  By canton7 at 2013-05-29 09:37:36
• Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge. Carefully go through the conflicts. Picking one side verbatim is not always the right choice!
  By imachuchu at 2012-07-25 23:32:09
• Merge conflicts are a natural part of collaboration. When facing one, *stay calm*. Read "How to resolve conflicts" in man git-merge. Carefully go through the conflicts. Picking one side verbatim is not always the right choice!
  By charon at 2012-07-18 17:26:10