Git Workflow

Branching

• Master is the trunk and MUST always be in a "ready to release" state
• Use feature branches for development work
  • Naming: VIM-XXXX/short-description (e.g., VIM-3948/editor)
  • Rebase to master frequently to avoid large conflicts
• Small, isolated changes (bug fixes, minor tweaks) MAY go directly to master
• Unfinished changes MAY be committed to master only if they do NOT break functionality
• Use rebase for integration, not merge commits (linear history)

Commits

Standard format:

VIM-XXXX Description of the change