javascript - Husky Git hooks Workflow Issue - Pre-push

Question

I want to implement a pull from the main/master branch before all pushes. I'm currently doing that by running "git pull origin main" but Husky isn't consistently kicking out of the push and when it does I resolve the conflicts, start the commit/push process again and it reverts the files to the version from main, losing the changes I've made. I think I understand why that's happening: it's comparing my local to main, seeing that I have made changes since the last local merge and pulling them in. Any suggestions on how to escape the loop without using the bypass flag? I don't want the team defaulting to using that as I think it encourages them to ignore the workflow.

question from:https://stackoverflow.com/questions/65943692/husky-git-hooks-workflow-issue-pre-push

Answer 1

Waitting for answers