gullygit/householdai-editor

Git workflow

When landing a feature branch onto master (or main):

• —Multiple commits on the branch → use --no-ff so they stay visually grouped in the git graph:

  git checkout master
  git merge --no-ff <branch>
  git push

• —Single commit on the branch → a fast-forward (or direct commit) is fine; no merge commit needed.
• —Always add Co-author or Co-Assistant in Git commits descriptions, if code is written with AI
• —Before writing any code, check if the main branch is already pulled, and if a new branch is already in place on top o the main branch