TortoiseJS

The following information is out-of-date, but kept for historical reference.

Note that TortoiseJS is its own repository (currently https://github.com/qiemem/TortoiseJS). We're using git subtree to manage it as a dependency. For the most part, you don't have to think about this until you want to push to or pull from the remote TortoiseJS repo. You can just commit to Galapagos as normal. git subtree will take care of extracting the relevant commits to TortoiseJS.

For convenience, I recommend running:

git remote add tortoisejs https://github.com/qiemem/TortoiseJS

To push (assuming you added the tortoisejs remote):

git subtree push --prefix app/assets/javascripts/TortoiseJS tortoisejs master

To pull:

git subtree pull --prefix app/assets/javascripts/TortoiseJS tortoisejs master --squash

If git subtree push is telling you that you're behind the remote repo, but git subtree pull is telling you you're up to date, do:

git push tortoisejs `git subtree split --prefix app/assets/javascripts/TortoiseJS <local branch>`:master --force

That forces git to push the subtree's commits.

Note that folders should not end with "/"!

Here is a great introduction to subtrees: https://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/