They asked me to explain the difference between git merge and git rebase, and when I would use each in a team environment.
Sigiloso
I explained that git merge preserves the complete branch history and creates a merge commit, making it safer and more transparent for collaborative workflows. In contrast, git rebase rewrites commit history to create a linear project history, which keeps the log cleaner but should be used carefully on shared branches. I mentioned that I prefer rebasing for local feature branches before merging, but use merge commits when integrating into shared or protected branches to avoid rewriting public history.