This is the problem with git merges, all confusing...
Bruno
On 08/10/13 11:44, Bruno Chareyre wrote:
Hi there,
After Jerome, Jan also got the idea of changing hyperlinks in the doc,
from doc/something to doc/current/something.
Please don't do that. Remi is changing the structure of the website and
it is not stabilized yet.
In the end, hyperlinks that have NOT been changed will be ok. If they
have been changed with "/current" in the meantime they will fail.
Cheers
Bruno
p.s. Please Jan, could you check if you have setup auto-rebase? For some
reason you are still triggering some merges.
--
_______________
Bruno Chareyre
Associate Professor
ENSE³ - Grenoble INP
Lab. 3SR
BP 53
38041 Grenoble cedex 9
Tél : +33 4 56 52 86 21
Fax : +33 4 76 82 70 43
________________
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@xxxxxxxxxxxxxxxxxxx
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp