-
Notifications
You must be signed in to change notification settings - Fork 10
Conversation
hmm - have you read through these? lint-staged/lint-staged#62 they talk about merge conflicts coming about after the pop. Can you setup sourcetree to use |
I think the merge conflicts from popping would be pretty rare, and only when you are committing a file partially. |
well we could also just remove the hook. if everyone has auto formatting on their editors then it does nothing |
Partial commits would also be useful for me as well I have just set up format on save |
Is anyone relying on the precommit to lint their files? we could leave |
@cheapsteak no complaints from me. We could also gitignore the settings file now that we don't need to support node_modules? |
either way works for me, whatever would allow me to stop having to stash and unstash my settings between branches and pulls |
I would prefer we go with simple and not in anyones way. It looks like the easiest solution is to remove lint-staged. I'm fine with this since I get no benefit from it anyway - it was mostly because I thought @Jephuff didn't want to use auto-format on his editor. |
8cbd84e
to
bbd9e18
Compare
0c70cfe
to
2847253
Compare
Proposed change to precommit: This stashes unstaged changes and then restores them so you can do partial commits.