Creating and merging branches in Git - Git Guides (2020)

Learn the basics of creating and merging branches in Git. In Git, branches are a part of your everyday development process. Git branches are effectively a pointer to a snapshot of your changes.

When you want to add a new feature or fix a bug—no matter how big or how small—you create a new branch to encapsulate your changes. A branch represents an independent line of development, serving as an abstraction for the edit/stage/commit process. New commits are recorded in the history for the current branch, which results in a fork in the history of the project

In this video, we’ll cover how to effectively use branches in Git. Learn how to create and merge a Git branch.

0:30 Using git branch

3:10 Working with teammates in Git

Want to learn more about how to unleash your team's potential? Subscribe to Atlassian's channel here. And for more Atlassian product training and tutorials, visit Atlassian University at

[NotJoelShapiro]

You know that feeling you get after remembering that at your old job you were in a bunch of little training videos and then forgot about them immediately after and never realized that they got super widely shared and now you're immortalized on the youtubes?. That's how watching this video feels, don't ask me why.

[pk-all-day]

Exactly what I needed and concise. Thank you!

[rayito]

Great Content, very informative thank you!

[madnessfortech]

thanks buddy very much helpful, keep up the good work.

[onafusimicheal]

Thank so much, this is really helpful

[ryanbaker]

Great content - I don't see the next video on conflicts...assuming that didn't get made?

[Pancakes]

<(O.O<) Odin Project gang rise up!! (>O.O>)

[petrplenkov]

He mentions next videos - but I cannot find any new video about git conflicts. Does it exist? Thanks!

[HardDriver]

Is nobody going to talk about the coffee mug on that wobbly cube?

[Alvin_Vivian]

If I have unfinished code I haven't committed to master, and all of a sudden I need to push a small bug fix to production (without pushing out all that unfinished code), how do I do it?

[kushsharma]

you never used git push? Could you explain when is it used?

[georgetsiklauri]

Well, the page which this video is present at (the one, which you reference in the description of this video), says, that "git branch -a" lists all remote branches. This is not entirely true; for listing all remote branches, we have "git branch -r". "git branch -a" lists **both** local and remote branches.

[youtubeminute]

git commit -m "mandatory odin project brought me here"

[drewdaniels]

This guy's coffee mug has me nervous