The 12 Days of Git, Day 10: Merging Different Versions with Git

FacebooktwitterlinkedinmailFacebooktwitterlinkedinmailby feather

On the tenth day of Christmas, my true love gave to me… ten easy merges.

In the previous lesson, we learned about using remote branches with Git to share branches on remote repos, which makes collaborating with other very easy. Today, we’re going to to learn about merging different versions with Git, so that we can fix conflicts when more than one person changes the same part of a remote branch. Continue reading The 12 Days of Git, Day 10: Merging Different Versions with Git

The 12 Days of Git, Day 9: Using Remote Branches with Git

FacebooktwitterlinkedinmailFacebooktwitterlinkedinmailby feather

On the ninth day of Christmas my true love gave to me… nine versions a-keeping.

In the previous lesson, we learned about using Git to experiment safely by creating new branches and adding commits to a specific branch. Today, we’re going to use the new branch we created in that last lesson to learn about using remote branches with Git. Continue reading The 12 Days of Git, Day 9: Using Remote Branches with Git

The 12 Days of Git, Day 8: Using Git to Experiment Safely

FacebooktwitterlinkedinmailFacebooktwitterlinkedinmailby feather

On the eighth day of Christmas, my true love gave to me… eight different branches.

In the previous lesson, we learned about keeping your Git repository up-to-date with others’ changes by configuring an upstream remote and pulling new changesets from that remote. Today, we’re going to return to our example Santa Tracker repo, and learn about using Git to experiment safely. Continue reading The 12 Days of Git, Day 8: Using Git to Experiment Safely

The 12 Days of Git, Day 7: Keeping Your Git Repository Up-To-Date with Others’ Changes

FacebooktwitterlinkedinmailFacebooktwitterlinkedinmailby feather

On the seventh day of Christmas, my true love gave to me… seven sets of changes.

Yesterday, we learned about making a copy of a Git repository by cloning it directly, and by forking it on GitHub. Today, we’re going to learn about keeping Your Git repository up-to-date with others’ changes. Continue reading The 12 Days of Git, Day 7: Keeping Your Git Repository Up-To-Date with Others’ Changes