Short Git Series by M-Way Solution

Nice short series of Git. Looking at branch differently now. Before, it’s like a “channel”. Now, understand it as also a “pointer” like tag. Still, not really dare to follow this git-flow, that is using feature-branch or a branch as a feature.

We’ve been using Git as a versioning tool for most of our projects for several years by now. Despite this, there are several key questions that seem to crop up every so often. A lot of these questions are centered around the topics of branching, merging and rebasing.

Source: An Introduction to Git, Part 1 of 3 | Thinking Mobile

 

While the first part covers the very basics of Git, this post is going to focus on merging and rebasing in more detail.

Source: Git Merge and Rebase, Part 2 of 3 | Thinking Mobile

 

While the first part covered the very basics of Git and the second part focused on merging and rebasing this post is going to cover a topic I’ve complete ignored until now: Git conflicts.

Source: Git Conflicts, Part 3 of 3 | Thinking Mobile

 

 

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Google photo

You are commenting using your Google account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s