dist/pull: remove unused variables
dist/pull: apply the stashed changes
dist/pull: fetch, then try to merge
dist/pull: simplify the force-pull code even more