[Conkeror] Development now occurring in the master branch of the git repository

[Brian May]

>>>>> "Brian" == Brian May <bam at snoopy.apana.org.au> writes:

Me thinks this is still not quite right:



brian at aquifer:~/tree/conkeror$ git reset --hard 
HEAD is now at 3a984f0... VERSION 0.42.42
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'branding/brand.dtd' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm branding/brand.dtd
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'branding/brand.properties' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm 'branding/brand.properties'
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'chrome/chrome.manifest' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm 'chrome/chrome.manifest'
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'components/download_helper.js' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm 'components/download_helper.js'
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'content/ChangeLog' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm 'content/ChangeLog'
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'content/NEWS' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm 'content/NEWS'
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'content/back-forward.html' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm 'content/back-forward.html'
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'content/conkeror.css' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm 'content/conkeror.css'
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'content/conkeror.xul' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm 'content/conkeror.xul'
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'content/contents.rdf' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm 'content/contents.rdf'
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'content/context.js' would be overwritten by merge.
Merge with strategy recursive failed.
brian at aquifer:~/tree/conkeror$ rm 'content/context.js'
brian at aquifer:~/tree/conkeror$ git merge origin
fatal: Untracked working tree file 'content/contributors' would be overwritten by merge.
Merge with strategy recursive failed.


Is there an easier way?

Or maybe I should just start with a fresh copy.
-- 
Brian May <bam at snoopy.apana.org.au>