OSD600 Lab4

Working on this lab made me realized how little of git I actually knew. The non-stop merging branch got a bit confusing for me, then throw in rebasing I got completely lost. But luckily after re-reading a few times, I learned to understand! so for anyone else who was as confused as me, here are what they mean

Branch- Is a simple movable pointer to commits, the default branch is called master that always points to your last commit

Merging- Is combining two commits together, But can cause a lot of merge conflicts and luckily we learned how to deal with them.

Rebasing- Lets us move branches around by changing the commit that they are based on, which can be confusing. So practice it a lot!

Advertisements

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 )

Twitter picture

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

Facebook photo

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

Google+ photo

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

Connecting to %s