Table Of Content for post

Skip to the relevant sections if needed.

• Concepts for resolving Git conflicts
• Setting up different editors / tool for using git mergetool
  • Finding out what mergetool editors are supported
• mergetool simple code example for vimdiff
• Other great references and tutorials

Concepts for resolving Git conflicts

For ...

I have been making incremental improvements to the blog, including:

• slight stylistic CSS change (finally know which CSS to fix)
• fixing jQuery plugin for returning search results properly

When there is enough material I will blog about how to customize different parts of this statically generated blog using Pelican.

Learning ...

Why virtualenv

It’s a tragedy whenever a code breaks after a software “update”. I have recently started using virtualenv for python to prevent my macport / apt-get updates from messing up the code of my research projects. Additionally, by providing a list of python package version, it can enhance reproducibility ...