Hello,
When updating local instance of our Galaxy, the hg aborted:
pulling from https://bitbucket.org/galaxy/galaxy-dist/
searching for changes
adding changesets
adding manifests
adding file changes
added 1482 changesets with 3989 changes to 1340 files
abort: untracked file in working directory differs from file in requested revision: 'doc/Makefile'
and :
-bash-3.2$ hg update
abort: untracked file in working directory differs from file in requested revision: 'doc/source/conf.py'
Could you please tell me what this may be the problem?
Thanks
___________________________________________________________
Please keep all replies on the list by using "reply all"
in your mail client. To manage your subscriptions to this
and other Galaxy lists, please use the interface at:
http://lists.bx.psu.edu/