DevOps Interview FAQ

SCM – Git How do you resolve a merge conflict?Identify conflicted files → edit markers (<<<<, ====, >>>>) → keep correct code → git add → git commit. 🔁 Git Reset Moves your branch back to an old commit Can remove commits from history Used when ...