On Wed, Apr 17, 2013 at 8:05 PM, Robert Baertsch
<robert.baert...@gmail.com> wrote:
> When merging in the latest galaxy-central, I'm getting this error:
>
> merging lib/galaxy/webapps/galaxy/controllers/library_common.py
> merging lib/galaxy/webapps/galaxy/controllers/page.py
> merging lib/galaxy/webapps/galaxy/controllers/user.py
> merging run.sh
> merging scripts/manage_db.py
> abort: could not symlink to 'style': File exists: 
> /Users/robertbaertsch/src/medbook-merge/medbook-galaxy-central/static/june_2007_style
>
> Should I do the following:
>
> $ mv june_2007_style style
> $ ln -s style june_2007_style
>
> and then
>
> $ hg merge

See this thread for a tested solution:
http://lists.bx.psu.edu/pipermail/galaxy-dev/2013-February/013431.html
http://lists.bx.psu.edu/pipermail/galaxy-dev/2013-April/014121.html

Peter
___________________________________________________________
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/

To search Galaxy mailing lists use the unified search at:
  http://galaxyproject.org/search/mailinglists/

Reply via email to