Matteo Silvestri
411a2388ac
3 way merge was failing because of missing ancestors. Fetching the upgrade-helper-diff repository as one of your app's remotes fixes the problem. The upgrade-helper-diff contains a branch for each version with a clean app bootstrapped with the create-app script. Signed-off-by: Matteo Silvestri <matteosilv@gmail.com>
Scripts
Here you will find a variety of script contributions.