sudo -s Got root?

Resolving git conflicts

If you do a rebase or a pull and it has a merge conflict do the following

1. Check for file that is having conflict

 git status

2. Edit code that has conflict and git add

 git add -a 

3. Commit edit

git commit -am "Some message" 

Deleting special character files in UNIX

If you're an idiot like me and managed to create a file with special characters like --exclude=*.svn and need to remove it, here's how

rm ./'--exclude\=\*.svn'

Remember don't be an idiot like me

Hello world!

Hello World