DevOps & Cloud 路 Intern to senior
Every engineering role uses Git, so almost every interview loop includes a few questions about it. Interviewers want to know you can work on a shared branch without losing work, explain what a command does to history, and recover when something goes wrong.
3 of 5 questions match
Clear filtersBoth integrate changes from one branch into another: merge keeps both histories and joins them with a merge commit, while rebase rewrites your commits so they appear on top of the target branch, giving a linear history.
Open the conflicted files, decide what the final code should be between the conflict markers, remove the markers, run the tests, then stage the files and continue the merge or rebase.
git revert creates a new commit that undoes an earlier one and is safe on shared branches; git reset moves the branch pointer back to an earlier commit, effectively removing later commits from that branch鈥檚 history.