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.
| set -g update-environment "DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY" | |
| set-environment -g 'SSH_AUTH_SOCK' ~/.ssh/ssh_auth_sock |
| #!/bin/bash | |
| if test "$SSH_AUTH_SOCK" ; then | |
| ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock | |
| fi |
| function nestCollection(model, attributeName, nestedCollection) { | |
| //setup nested references | |
| for (var i = 0; i < nestedCollection.length; i++) { | |
| model.attributes[attributeName][i] = nestedCollection.at(i).attributes; | |
| } | |
| //create empty arrays if none | |
| nestedCollection.bind('add', function (initiative) { | |
| if (!model.get(attributeName)) { | |
| model.attributes[attributeName] = []; |
| """ | |
| Using Jinja2 with Django 1.2 | |
| Based on: http://djangosnippets.org/snippets/2063/ | |
| To use: | |
| * Add this template loader to settings: `TEMPLATE_LOADERS` | |
| * Add template dirs to settings: `JINJA2_TEMPLATE_DIRS` | |
| If in template debug mode - we fire the template rendered signal, which allows | |
| debugging the context with the debug toolbar. Viewing source currently doesnt |
