Back to Browse

Mastering DevOps Git – Lecture 02 | Git Reset, Revert, Branching, PR & Merge Conflict Explained

40 views
Feb 19, 2026
1:20:25

Mastering DevOps Git – Lecture 02 | Git Reset, Revert, Branching, PR & Merge Conflict Explained Welcome to Mastering DevOps – Git Lecture 02 🚀 In this lecture, we dive into advanced Git concepts used in real DevOps environments: ✔ Git Remote & Push ✔ Git Fetch vs Pull ✔ Git Reset (Mixed, Soft, Hard) ✔ Git Revert ✔ Git Branch Creation & Deletion ✔ Working with Multiple Developers ✔ GitHub Pull Request ✔ Merge Conflict & Resolution This session is fully hands-on and practical. 🔹 Commands Practiced in This Lecture git status git log --oneline git remote add origin https://github.com/onlineTrainingguy/Bank.git git branch git branch -m main git push -u origin main git fetch git merge origin/main git pull origin main git add -A git commit -m "local.html file is added" git push origin main git push -f origin main # Git Reset Commands git reset HEAD~1 git reset --soft HEAD~1 git reset --hard HEAD~1 # Git Revert git revert a28feb4 git revert 8538f05 # Branch Management git branch dev1 git branch dev2 git branch -D dev1 git push origin dev1 git push origin dev2 git checkout main git checkout dev1 git checkout dev2 git merge main git push origin dev1 git push origin dev2 git push origin main 🔥 Topics Covered in Detail ✅ Git Reset Modes Mixed Mode Soft Mode Hard Mode When NOT to use hard reset ✅ Git Revert Safe undo for shared branches Difference between reset and revert ✅ Branching Strategy Creating developer branches Merging main into dev branches Pushing branches to remote ✅ GitHub Pull Requests Creating PR Review process Merge options (merge, squash, rebase) ✅ Merge Conflict Resolution Why conflicts occur Conflict markers explanation Manual resolution steps Commit after resolving conflict This lecture prepares you for: Production Git workflows DevOps pipelines Team collaboration Real-world interview questions git reset soft mixed hard, git revert tutorial, git reset vs revert, git branch tutorial, git branching strategy, git merge conflict, merge conflict resolution git, github pull request tutorial, git fetch vs pull, git push force, git devops training, mastering devops git lecture 2, git practical tutorial, git commands advanced, git interview questions devops, git branch merge, git remote add origin, git hands on practice, git course for beginners, devops git full course

Download

1 formats

Video Formats

360pmp460.0 MB

Right-click 'Download' and select 'Save Link As' if the file opens in a new tab.

Mastering DevOps Git – Lecture 02 | Git Reset, Revert, Branching, PR & Merge Conflict Explained | NatokHD