Bilal898

Squashing Git Commits

The easy and flexible way

This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).

Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.

Switch to the master branch and make sure you are up to date:

Example: You have a branch refactor that is quite different from master. You can't merge all of the commits, or even every hunk in any single commit or master will break, but you have made a lot of improvements there that you would like to bring over to master.

Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.

On master:

> git co -b temp

	# create a file C:\Users\[user]\.bashrc
	# add this content
	# add your onw aliases or changes these ones as you like
	# to make a dot (.bashrs) file in windows, create a file ".bashrs." (without extention) and save. windows will save it as ".bashrc"

	alias ls='ls -alh'
	alias cdnginx='cd /c/nginx && ls'
	alias cdmcga='cd /c/Users/[user]/sbox/node/mcga && ls'
	alias cdfood9='cd /c/Users/[user]/sbox/node/food9 && ls'
	alias cdmysql='cd /c/nginx/mysql/bin && ls'