nx/docs/guides/git-branching-strategies.md

A recommended Git Strategy

We recommend the following:

• Always use Pull Requests when merging code. A PR has two purposes:
  • To initiate a conversation and to get feedback on the implementation
  • To initiate a build and to run tests and lint checks to ensure that we don’t break the build
• Avoid long-running branches and don’t merge branches locally
• Enforce a git merging strategy that ensures that feature branches are up-to-date before merging. This ensures that these branches are tested with the latest code before the merge.

The website trunkbaseddevelopment.com contains a lot of very helpful information on trunk-based development and is a great resource.

The following sections are the most pertinent:

• Feature flags
• Strategy for migrating code
• Feature branches