SnabbCo/snabbswitch — pull request #248 by eugeneia (2014-08-28 15:15:27+00:00)
Title: [neutron-sync-agent] Disregard local history, always rebase on origin.

Use `git pull --rebase` instead of (interactive) `git merge --ff` in order to always sync with `origin` and drop possible local contradictions.