While the following structure is not an absolute requirement or enforced by the tools, it is a recommendation based on what the JavaScript and in particular Node community at large have been following by convention.
Beyond a suggested structure, no tooling recommendations, or sub-module structure is outlined here.
lib/ is intended for code that can run as-issrc/ is intended for code that needs to be manipulated before it can be used
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
| # United States of America Python Dictionary to translate States, | |
| # Districts & Territories to Two-Letter codes and vice versa. | |
| # | |
| # Canonical URL: https://gist.github.com/rogerallen/1583593 | |
| # | |
| # Dedicated to the public domain. To the extent possible under law, | |
| # Roger Allen has waived all copyright and related or neighboring | |
| # rights to this code. Data originally from Wikipedia at the url: | |
| # https://en.wikipedia.org/wiki/ISO_3166-2:US | |
| # |