Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
econchick committed Mar 23, 2013
1 parent 5e3ca3a commit adb1ec0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/_site/Save-your-progress/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h3>Git and GitHub</h3>
<h3>Your workflow with git</h3>
<p>With git, users can do what’s called branching and merging. With a repo, you have a main, original branch called master. Off of master, you can make branches. Consider this to give you the ability to play around with code, break things, etc, while keeping the original/master safe. If you’re happy with what has been completed within a branch, you merge the branch into the master branch, and it becomes your new original.</p>

<p>It’s good to start off using git with good habits. Whenever you start something new, like as soon as you clone a repository, one good habit is to maked a branch to merge in later when you’re satisfied with your progress. </p>
<p>It’s good to start off using git with good habits. Whenever you start something new, like as soon as you clone a repository, one good habit is to make a branch to merge in later when you’re satisfied with your progress. </p>

<p>When you are intermittingly saving your progress on a branch, make a commit to your branch. Commit your code regularly, whether when you’re done for the day, when you‘ve finished coding out one of the parts of the tutorial, before you answer the phone when someone calls you, etc. Rather than making one big “atomic” commit at big milestones (e.g. after the completion of one tutorial, an implementation of a feature), doing this makes it very easy to undo changes that you’ve made without losing big progress. </p>

Expand Down

0 comments on commit adb1ec0

Please sign in to comment.