Coderwall is an open product on Assembly — now you can help build it! Jump in and get started. x coderwall Protips Job Board Sign In Register Where developers come to connect, share, build and be inspired. Join Coderwall Leonardo Etcheverry aka legumbre on the intertubes. github.com/legumbre legumbre Calling all PHP Software Engineer (m/f)s. Speicher 210 has a great engineering team and is hiring! feature your jobs here Share this 7 11158 views git emacs magit June 16, 2012 12:08am Use magit-ediff or 'e' on an unmerged item to resolve merge conflicts with ediff. Magit will set up an ediff with three buffers A, B and C. A and B are the original (conflicting) files, and C is the conflicted merge. Use 'n'/'p' to move to the next/previous conflict, use 'a'/'b' to choose which changes (those in a A or B) sho...