tarball.tar.gz

nginx

gogs1

gogs2

gogs3

Jenkins

gogs

The course is a collection of DevOps practices and exercises that will teach learners how to use three of the most important DevOps tools: Docker, Git, and Jenkins. Each set of katas will introduce the learners to the tool and its usage. 

The katas build on each other, so that after you're finished, you will have created a complete Continuous Integration/Continuous Delivery pipeline. Through these katas, you will learn to tackle common challenges, optimize workflows, and enhance collaboration between development and operations teams. 

Each katas focuses on specific DevOps practices, enabling readers to gain valuable insights and proficiency in implementing DevOps methodologies effectively. With its interactive approach, the course empowers learners to build a solid foundation in DevOps and foster continuous improvement within their organizations.

DevOps Katas: Mastering DevOps Practices

**Merging** is essentially the opposite of branching. Branches allow changes in a repository to be separated. Merging is the process of combining work that's separated between branches.

# Step 1: Merge changes between branches

The command to merge changes is given below.



Learn about merging branches with divergent histories.

Introduction to DevOps

Getting Started With DevOps Katas

Container and Docker

Docker Katas

Source Control Management and Git

Git Katas

Continuous Integration and Jenkins

Jenkins Katas

Mini Project: Git and Jenkins Katas

Conclusion

Appendix

Git Kata 3: Merging

Step 1: Merge changes between branches