Tuesday, July 20, 2010

permission issue while deploying the code to the server using capistrano

sudo chmod go-rw /var/lib/gems/

This command will give the permission only to current user.

Wednesday, July 14, 2010

GIT

1. While fetching a pull some time we get a error "can not merge due to local changes"
To get rid of this issue
=> git stash
=> git pull
=> got stash apply

2.if you are sure those changes got no value you can also: git reset --hard (that will remove the changes you have)

3. Just run the following command on the file or path you want to ignore the changes of:
git update-index --assume-unchanged

If you wanna start tracking changes again run the following command:
git update-index --no-assume-unchanged

4. http://www.sourcemage.org/Git_Guide

5. How to resolve the git merge :http://stackoverflow.com/questions/2073841/git-marking-files-as-resolved