0d52df43e8
* fix: re-stage files after pulling This should fix an issue that prevented changes from being committed when `git pull --rebase --autostash` used. Issue #406 * chore: mark pre-commit hook as executable * fix: detect conflicts after pull