Hacker News new | ask | show | jobs
by helix278 695 days ago
You might find this git option helpful: https://git-scm.com/docs/git-config#Documentation/git-config...
1 comments
helix278 695 days ago
Note that this won't solve all cases. For example, you still have to watch out when merging branches with different submodule commit hashes that you run submodule update while merging.
link