Re: [Orgmode] Git pull has merge conflict

2010-10-30 Thread Noorul Islam
On Sat, Oct 30, 2010 at 7:02 PM, Greg Troxel wrote: > > Noorul Islam 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

Re: [Orgmode] Git pull has merge conflict

2010-10-30 Thread Noorul Islam
On Sat, Oct 30, 2010 at 7:02 PM, Greg Troxel wrote: > > Noorul Islam 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

Re: [Orgmode] Git pull has merge conflict

2010-10-30 Thread Greg Troxel
Noorul Islam 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 > > $ noo...@sajida:~/emacs/org-mode$ git pull

[Orgmode] Git pull has merge conflict

2010-10-29 Thread Noorul Islam
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 C