Updating LTLMoP

This is a brief guide for properly updating your copy of LTLMoP to the newest version, aimed at developers who may have made changes on their local copy.

Quick update

1. Switch to the development branch: git checkout development
2. Update your copy of the development branch: git pull --ff-only upstream development
   • If this succeeded, go to Step 3.
   • If this fails (with an error like "fatal: Not possible to fast-forward, aborting.") go to Step א.
3. Make sure all subcomponents are up-to-date: python ../dist/setup.py (assuming you’re currently in src/)
4. All done!

Recovering from a messy personal development branch

א. You've reached this step because you have commits on your development branch that are not on the official branch. You should run git log to see what's going on. You can choose to either create a new branch with your personal commits (continue to Step ב), or just discard the commits (skip ahead to Step ג).

ב. Create a branch pointing to your most recent commit: git branch my_awesome_branch

ג. Stash any changes you might have to the working directory: git stash

ד. Force your development branch to be identical to the upstream one: git reset --hard upstream/development

ה. (Optional) If you created a branch in Step ב, it is recommended you rebase it onto the new development branch:

• git checkout my_awesome_branch
• git rebase development
• If you run into any conflicts, you can resolve them as you normally would (e.g. git mergetool and then git rebase --continue)