Thanks for the help, Björn. I will keep an eye on it when I go to merge. <span></span><br><br>Il giorno martedì 12 febbraio 2013, Björn Grüning  ha scritto:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi Amanda,<br>
<br>
the tools directory is also tracked and updated in mercurial. But only<br>
the tools that are shipped with galaxy. If you have inserted your own<br>
tools, they want be affected. If you modified galaxy tools that are part<br>
of main galaxy, than you will probably get a merge conflict. But<br>
mercurial will tell you that.<br>
<br>
Kind regards,<br>
Bjoern<br>
<br>
&gt; Since I can&#39;t find this on any of the wikis: when updating Galaxy<br>
&gt; through mercurial, is the tools directory affected? Our instance has<br>
&gt; backups of the directory, but I want to know whether I will have to<br>
&gt; take care of them when I pull down the latest release.<br>
&gt;<br>
&gt; Thanks in advance.<br>
&gt;<br>
<br>
<br>
</blockquote><br><br>-- <br>Amanda Zuzolo<br>Bioengineering Major, George Mason University<br>Metabiome Informatics Group, Environmental Biocomplexity<br>