Noorul Islam noo...@noorul.com writes:
I am not sure why this conflict is arising even after resetting to
head and then doing a pull
$ noo...@sajida:~/emacs/org-mode$ git reset --hard
HEAD is now at ba6b6f3 Merge branch 'master' of git://repo.or.cz/org-mode
$
On Sat, Oct 30, 2010 at 7:02 PM, Greg Troxel g...@ir.bbn.com wrote:
Noorul Islam noo...@noorul.com writes:
I am not sure why this conflict is arising even after resetting to
head and then doing a pull
$ noo...@sajida:~/emacs/org-mode$ git reset --hard
HEAD is now at ba6b6f3 Merge branch
On Sat, Oct 30, 2010 at 7:02 PM, Greg Troxel g...@ir.bbn.com wrote:
Noorul Islam noo...@noorul.com writes:
I am not sure why this conflict is arising even after resetting to
head and then doing a pull
$ noo...@sajida:~/emacs/org-mode$ git reset --hard
HEAD is now at ba6b6f3 Merge branch
I am not sure why this conflict is arising even after resetting to
head and then doing a pull
$ noo...@sajida:~/emacs/org-mode$ git reset --hard
HEAD is now at ba6b6f3 Merge branch 'master' of git://repo.or.cz/org-mode
$ noo...@sajida:~/emacs/org-mode$ git pull
Auto-merging ORGWEBPAGE/index.org