There is nothing painless about git

(written by lawrence krubner, however indented passages are often quotes). You can contact lawrence at: lawrence@krubner.com, or follow me on Twitter.

But some feel that merges can be painless. Good luck.

Post external references

  1. 1
    http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html
Source