[IMPORTANT] Change to repo tools
Posted: 14 Dec 2013, 18:41
As of today, tmwa-server-data no longer contains a tools/ directory; instead it contains a tools/ submodule. If you set up the hooks as recommended, 'git pull' *should* make everything just work, but only if you have a clean tools subdir, which most people don't.
To fix, run
BEFORE running 'git pull'[/b]
If you've already tried to pull and got a conflict message, run 'git merge --abort' and then the step above.
This means a change in workflow for anybody who is *changing* the tools. Fortunately, such changes are rare and it should be obvious how since we're already using a submodule for client-data.
In a few weeks, I will apply a symlink to client-data/. I am not doing it now to avoid a flag day. Until then, there is a total freeze on changes to tools/ in client-data.
To fix, run
Code: Select all
git clean -fxd tools
If you've already tried to pull and got a conflict message, run 'git merge --abort' and then the step above.
This means a change in workflow for anybody who is *changing* the tools. Fortunately, such changes are rare and it should be obvious how since we're already using a submodule for client-data.
In a few weeks, I will apply a symlink to client-data/. I am not doing it now to avoid a flag day. Until then, there is a total freeze on changes to tools/ in client-data.