samundra/batti — pull request #1 by rhoit (2013-04-30 00:49:50+00:00)
Title: help updates!

it will cause the merge conflict! so you got to do from terminal.

```bash
$ cd /path/to/your/batti/
$ git reset --soft ece6c91 # sorry your git log will be bit messy if there are many commits
$ git stash # stash your uncommited changes
$ git pull git pull https://github.com/foss-np/batti/
$ git stash pop # your changes will show up but not commited
```
you can add and continue with the your commits!