Cloud and DevOps
  • DevOps Bootcamp
    • Introduction
    • ✔️INTRODUCTION TO DEVOPS
      • The DevOps approach
      • Environment
      • DevOps Roadmap
      • What is this CI/CD?
    • ✔️OPERATING SYSTEM $ LINUX BASICS
      • Introduction to Operating Systems
      • Introduction to Virtualization & Virtual Machines
      • Linux File System
      • Introduction to Command Line Interface
      • Package Manager
      • Linux Distributions
      • Working with Vim Editor
      • Linux Accounts & Groups (Users & Permissions)
    • ✔️VERSION CONTROL WITH GIT
      • Introduction to Version Control and Git
      • Basic Concepts of Git
      • Setup Git Repository Remote and Local
      • Working with Git
      • Initialize a Git project locally
      • Concept of Branches
      • Merge Requests
      • Deleting Branches
      • Rebase
      • Resolving Merge Conflicts
      • Gitignore
      • Git stash
      • Going back in history
      • Undoing commits
      • Changing commits
      • Merging branches
      • Git for Devops
      • Extra notes about Git
    • ✔️Working with Databases
      • Databases in the development process
      • Database Types
    • ✔️Build Tools and Package Manager Tools
      • Introduction to Build Tools
      • Install Build Tools
      • Build an Artifact
      • Build Tools for Development
      • Run the Application
      • Build JS Applications
      • Common Concepts and Differences of Build Tools
      • Publish an Artifact
      • Build Tools & Docker
      • Build Tools for DevOps
    • ✔️Cloud & Infrastructure as Service Basics
      • Intro to Cloud & IaaS
      • Deploy and run application artifact on Droplet
      • Create and configure a Linux user on a cloud server
    • ➖Artifact Repository Manager with Nexus
      • what is artifact
      • install and run nexsus
      • Page 1
    • ✔️Containers with Docker
      • What is a Container?
      • Container vs Image
      • Docker vs. Virtual Machine
      • Docker Architecture and components
      • Main Docker Commands
      • Debug Commands
      • Docker Network
      • Workflow with Docker
      • Developing with Docker
      • Docker Compose - Run multiple Docker containers
      • Dockerfile - Build your own Docker Image
      • Private Docker Repository
      • Deploy docker application on a server
      • Docker Volumes - Persisting Data
      • Create Docker Hosted Repository on Nexus
      • Deploy Nexus as Docker Container
      • Docker Best Practices
    • ➖Build Automation & CI/CD with Jenkins
    • ✔️All about AWS Services
      • Introduction to AWS
      • Create an AWS account
      • IAM - Manage Users, Roles and Permissions
      • Regions & Availability Zones
      • VPC - Manage Private Network on AWS
      • S3(Simple Storage Service)
      • AWS Lambda
      • CIDR Blocks
      • Introduction to EC2 Virtual Cloud Server
      • Deploy to EC2 server from Jenkins Pipeline
      • Introduction to AWS CLI
      • AWS & Terraform Preview
      • Container Services on AWS Preview
    • ✔️Container Orchestration with Kubernetes
      • Intro to Kubernetes
      • Running an application in Kubernetes
      • Main Kubernetes Components
      • Kubernetes Architecture
      • Minikube and kubectl - Local Kubernetes Cluster
      • Main kubectl commands
      • YAML Configuration File
      • Demo Project - Deploying Application in Kubernetes Cluster
      • Namespaces
      • Services
      • Ingress
      • Volumes
      • Replication Controller & Replica Sets
      • ConfigMap & Secret Volume Types
      • StatefulSet - Deploying Stateful Applications
      • Managed Kubernetes Services Explained
      • Helm - Package Manager for Kubernetes
      • Helm Demo - Managed K8s cluster
      • Deploying Images in Kubernetes from private Docker repository
      • Kubernetes Operators for Managing Complex Applications
      • Helm and Operator Dem
      • Secure your cluster - Authorization with RBAC
      • Microservices in Kubernetes
      • Demo project: Deploy Microservices Application
      • App Deployment
      • Production & Security Best Practices
      • Demo project: Create Helm Chart for Microservices
      • Demo project: Deploy Microservices with Helmfile
    • Kubernetes on AWS - EKS
    • ✔️Infrastructure as Code with Terraform
      • Introduction to Terraform
      • Declarative vs. Imperative Approaches
      • How Terraform works
      • Install Terraform & Setup Terraform Project
      • Providers
      • Resources & Data Sources
      • Change & Destroy Terraform Resources
      • Terraform commands
      • Terraform State
      • Output Values
      • Variables
      • Environment Variables
      • Create Git Repository for local Terraform Project
      • Automate Provisioning EC2 with Terraform
      • Provisioners in Terraform
      • Modules in Terraform
      • Automate Provisioning EKS cluster with Terraform
      • Complete CI/CD with Terraform
      • Remote State in Terraform
      • Terraform Best Practices
    • Programming Basics with Python
    • Automation with Python
    • Configuration Management with Ansible
      • Introduction to Ansible
    • Monitoring with Prometheus
    • ✔️Elastic Stack
      • ElasticSearch Q&A
    • Extra
      • What is Docker?
      • COMPLETE GUIDE DOCKER & KUBERNETES from STEPHEN GRIDER
Powered by GitBook
On this page
  1. DevOps Bootcamp
  2. VERSION CONTROL WITH GIT

Resolving Merge Conflicts

PreviousRebaseNextGitignore

Last updated 2 years ago

✔️