How to Resolve Merge Conflicts in Git Tutorial

Learn various commands and tools for merging two branches and resolving conflicts in GIT, an essential skill for data scientists.

How to Resolve Merge Conflicts in Git Tutorial | DataCamp

I spoke at Exoscale's The Future of Swiss Cloud 2021 event in Geneva, on the subject of automating SKS with GitOps using the DevOps Stack.

https://www.slideshare.net/raphink/sks-in-git-ops-mode

Advanced Git

Most people don't actually explore the depth of git commands and how much useful they can be when the time comes. With this thought in my mind, I took a talk on advanced git commands and good practices.

Topics Covered were:

• Interactive and Normal Rebasing
• Git Reset, Revert and Checkout
• Branching
• Stashing
• Cherry Picking

https://www.canva.com/design/DAEGzoLlbB8/T-jbcRqJXZ62ZKJzundghA/view#1

Presented Bringing Kubernetes Policy Enforcement to GitLab's Workflow at GitLab Commit 21.

Presented Shifting Policy Enforcement Left using GitOps at GitOps Con EU 2021