Repaso
Español

Explain the basic Git workflow you use every day with a team.

Answer

  • git switch -c feature/x (create a branch from an updated main).
  • Edit, then git add and git commit small logical commits.
  • git fetch / git pull --rebase to stay up to date with main.
  • git push -u origin feature/x, open a pull request.
  • Code review and CI checks; fix feedback with new commits.
  • Merge (squash or merge commit, per team rule), delete the branch.
  • Resolve conflicts by editing, git add, continue; never force-push shared branches.

Key terms

Practice this question in Repaso