sudo -s » Uncategorized http://sudoers.org Got root? Mon, 08 Aug 2011 20:35:36 +0000 en hourly 1 http://wordpress.org/?v=3.2.1 Resolving git conflicts http://sudoers.org/2011/08/resolving-git-conflicts/ http://sudoers.org/2011/08/resolving-git-conflicts/#comments Mon, 08 Aug 2011 20:35:36 +0000 limed http://sudoers.org/?p=92 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"
]]> http://sudoers.org/2011/08/resolving-git-conflicts/feed/ 0 Deleting special character files in UNIX http://sudoers.org/2009/04/deleting-special-character-files-in-unix/ http://sudoers.org/2009/04/deleting-special-character-files-in-unix/#comments Tue, 07 Apr 2009 20:25:36 +0000 limed http://sudoers.org/?p=21 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

]]> http://sudoers.org/2009/04/deleting-special-character-files-in-unix/feed/ 0 Hello world! http://sudoers.org/2008/11/hello-world/ http://sudoers.org/2008/11/hello-world/#comments Wed, 26 Nov 2008 18:25:21 +0000 admin http://sudoers.org/wordpress/?p=1 Hello World

]]> http://sudoers.org/2008/11/hello-world/feed/ 0