rebase

Contributing to Open-Source with Github

You want to contribute to an open-source project, but are scared away by all the git-complexity involved? This small guide will help you out. Step 1 - Fork, fork, fork First create a fork of the original project. You can do this easily by clicking the “Fork” button on the top of the Github project page. This will give you your own copy (fork) of the entire repository. Then, check out your fork:

Git: Squash your latests commits into one

With git it’s possible to squash previous commits into one. This is a great way to group certain changes together before sharing them with others. ~ Here’s how to squash some commits into one. Let’s say this is your current git log. * df71a27 - (HEAD feature_x) Updated CSS for new elements (4 minutes ago) * ba9dd9a - Added new elements to page design (15 minutes ago) * f392171 - Added new feature X (1 day ago) * d7322aa - (origin/feature_x) Proof of concept for feature X (3 days ago) You have a branch feature_x here.

Best Practice - The Git Development Cycle

Git is quite an awesome version control system. Why? Because it’s lightning fast, even for large projects (among other reasons). But, how do you use Git effectively for development on a daily basis? Let me explain to you. Branches With git you normally have a ‘master’ branch. This is also the branch you use to sync your code with other repositories. That is also the reason why you should never code in the ‘master’ branch.