From the course: Automating Kubernetes with GitOps

Unlock this course with a free trial

Join today to access over 24,700 courses taught by industry experts.

Working with branches and merges

Working with branches and merges - Kubernetes Tutorial

From the course: Automating Kubernetes with GitOps

Start my 1-month free trial Buy for my team

Working with branches and merges

“

- While working with Git, it's very important that you know how to deal with branches and how to merge them. So what is going on? Well, branches are used to develop new features in isolation from the main branch. And the main branch is the default branch, other branches can be manually added. Any Git repository can have multiple branches to allow developers to work independently. Everybody can have their own branch, and by using these branches, you can have teams of developers working on the same functionality before committing that. Now, once the work in the branch is complete and everything has been accepted, you can merge the branches back to the main branch to ensure that everything is the same. Now, while working with branches, you are going to like the git diff command. The git diff command shows you differences between the branches, and it'll also tell you if there are any potential conflicts. What should you think of a potential conflict? Well, a potential conflict is where a…

Contents