reborg

Rich Already Answered That!

A list of commonly asked questions, design decisions, reasons why Clojure is the way it is as they were answered directly by Rich (even when from many years ago, those answers are pretty much valid today!). Feel free to point friends and colleagues here next time they ask (again). Answers are pasted verbatim (I've made small adjustments for readibility, but never changed a sentence) from mailing lists, articles, chats.

How to use:

• The link in the table of content jumps at the copy of the answer on this page.
• The link on the answer itself points back at the original post.

Table of Content

legumbre

Use magit-ediff to resolve merge conflicts

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) should be the ones to keep in the merged file.

You can always just switch to buffer C and edit what the merged version should look like.

jozip

==> Downloading http://ftpmirror.gnu.org/emacs/emacs-23.3b.tar.bz2
File already downloaded in /Users/toki/Library/Caches/Homebrew
/usr/bin/tar xf /Users/toki/Library/Caches/Homebrew/emacs-23.3b.tar.bz2
==> Downloading patches
/usr/bin/curl -qf#LA Homebrew 0.8.1 (Ruby 1.8.7-249; Mac OS X 10.7.3) http://repo.or.cz/w/emacs.git/commitdiff_plain/c8bba48c5889c4773c62a10f7c3d4383881f11c1 -o 001-homebrew.diff https://raw.github.com/gist/1746342/702dfe9e2dd79fddd536aa90d561efdeec2ba716 -o 003-homebrew.diff --silent
==> Patching
/usr/bin/patch -f -p1 -i 001-homebrew.diff
patching file src/ChangeLog
patching file src/unexmacosx.c
/usr/bin/patch -f -p1 -i 002-homebrew.diff