##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
| # Transforming the vanilla recursive fib into the iterative DP version | |
| # through a series of mechanical steps. | |
| # | |
| # For more on converting recursive algorithms into iterative ones, see: | |
| # http://blog.moertel.com/posts/2013-05-11-recursive-to-iterative.html | |
| # original function | |
| def fib(n): |
This is applicable to both OS X and Linux. I use the same tools on both systems. In this guide, I'm going to set up an environment for a Flask app.
| /* | |
| * Note: This template uses some c++11 functions , so you have to compile it with c++11 flag. | |
| * Example:- $ g++ -std=c++11 c++Template.cpp | |
| * | |
| * Author : Akshay Pratap Singh | |
| * Handle: code_crack_01 | |
| * | |
| */ | |
| /******** All Required Header Files ********/ |
| #!/usr/bin/env python | |
| """How to do regular expressions in sqlite3 (using python).""" | |
| from __future__ import division, absolute_import, print_function, unicode_literals | |
| import re | |
| import sys | |
| import time | |
| import datetime | |
| import sqlite3 |
| # Shell to use with Make | |
| SHELL := /bin/bash | |
| # Set important Paths | |
| PROJECT := # Set to your project name | |
| LOCALPATH := $(CURDIR)/$(PROJECT) | |
| PYTHONPATH := $(LOCALPATH)/ | |
| PYTHON_BIN := $(VIRTUAL_ENV)/bin | |
| # Export targets not associated with files |
