From 57c3a33ebf173f06fe2e206c0dc3a2cf9aac3b4b Mon Sep 17 00:00:00 2001 From: Cameron McEfee Date: Fri, 25 Feb 2011 18:03:51 -0800 Subject: updated social --- _posts/2011-02-17-fork-a-repo.markdown | 12 ++++++------ _posts/2011-02-18-be-social.markdown | 14 ++++++++++++-- css/style.css | 9 ++++++++- images/bootcamp/bootcamp_4_issues.jpg | Bin 0 -> 11714 bytes images/bootcamp/bootcamp_4_org.jpg | Bin 0 -> 17767 bytes images/bootcamp/bootcamp_4_pull_requests.jpg | Bin 0 -> 10945 bytes 6 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 images/bootcamp/bootcamp_4_issues.jpg create mode 100644 images/bootcamp/bootcamp_4_org.jpg create mode 100644 images/bootcamp/bootcamp_4_pull_requests.jpg diff --git a/_posts/2011-02-17-fork-a-repo.markdown b/_posts/2011-02-17-fork-a-repo.markdown index 0ae782d..8cc493a 100644 --- a/_posts/2011-02-17-fork-a-repo.markdown +++ b/_posts/2011-02-17-fork-a-repo.markdown @@ -65,20 +65,20 @@ You’ve successfully forked a repo, but get a load of these other cool thin

What is the difference between fetch and pull?

- There are two ways to get changes from a remote repo or branch: fetch and pull. While they might seem similar at first, there are distinct differences you should consider. + There are two ways to get commits from a remote repo or branch: fetch and pull. While they might seem similar at first, there are distinct differences you should consider.

Pull

-					$ git pull upstreamPulls changes from upstream and adds them to the local repo
+					$ git pull upstreamPulls commits from 'upstream' and adds them to the local repo
-

When you use pull, Git tries to automatically do your work for you. It is context sensitive, so Git will apply any pulled changes to the branch you are currently working in. One thing to keep in mind is that pull automatically applies the changes without letting you review them first. If you don't closely manage your branches you may run into frequent conflicts.

+

When you use pull, Git tries to automatically do your work for you. It is context sensitive, so Git will merge any pulled commits into the branch you are currently working in. One thing to keep in mind is that pull automatically merges the commits without letting you review them first. If you don’t closely manage your branches you may run into frequent conflicts.

Fetch/Merge

-					$ git fetch upstreamFetches any new changes from the original repo
-					$ git merge upstream/masterMerges any changes fetched into your working files
+					$ git fetch upstreamFetches any new commits from the original repo
+					$ git merge upstream/masterMerges any commits fetched into your working files
-

When you fetch, Git downloads any changes from the specified branch, but does not apply them to your files. This is very useful if you need to keep your repo up to date but are working on something that might break if your files are updated. To apply the changes, you use merge. This combines the specified branches and prompts you if there are any conflicts.

+

When you fetch, Git gathers any commits from the target branch that do not exist in your current branch and stores them in your local repo. However, it does not merge them with your current branch. This is particularly useful if you need to keep your repo up to date but are working on something that might break if you update your files. To integrate the commits into your master branch, you use merge. This combines the specified branches and prompts you if there are any conflicts.

diff --git a/_posts/2011-02-18-be-social.markdown b/_posts/2011-02-18-be-social.markdown index f83cbc7..14f55f8 100644 --- a/_posts/2011-02-18-be-social.markdown +++ b/_posts/2011-02-18-be-social.markdown @@ -64,14 +64,24 @@ At some point you may want to stay up-to-date with a specific project. We’ You’ve done some of the most basic social interaction GitHub has to offer, but don’t stop there! Check out these other social features: -- Pull requests +- Pull Requests - If you are hoping to contribute back to the original fork, you can send the original author a [pull request](/pull-requests/). + Pull Requests + + You may find yourself wanting to contribute to someone else’s project, whether to add features or to fix bugs. After making changes, you can let the original author know about them by sending a [pull request](/pull-requests/). - Issues + + Issues When you are collaborating on a project with someone, you some times come across problems that need to be fixed. To help you keep track of these problems, each GitHub repo has a section called Issues. For an example, check out the [issues](https://github.com/octocat/Spoon-Knife/issues) for the Spoon-Knife repo. + +- Organizations + Organizations + + Have you found yourself wishing you could collaborate with multiple developers on one project? You can manage everyone with Organizations! With an organization you can establish teams with special permissions, have a public organization profile, and keep track of activity within the organization. + ##Lastly: Celebrate Congratulations! You are quite the socialite. What do you want to do next? diff --git a/css/style.css b/css/style.css index 75100a1..fb01d10 100755 --- a/css/style.css +++ b/css/style.css @@ -250,7 +250,6 @@ h2 span { overflow: hidden; margin: 0px; } - .founder { background:#f5f5f5; filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#fcfcfc',endColorstr='#ececec'); @@ -315,6 +314,14 @@ h2 span { color: #666666; } +img.bootcamp { + display: block; +} + +img.top-margin { + margin-top: 1em !important; +} + /****************************/ /* Explain Pop-up */ /****************************/ diff --git a/images/bootcamp/bootcamp_4_issues.jpg b/images/bootcamp/bootcamp_4_issues.jpg new file mode 100644 index 0000000..a710114 Binary files /dev/null and b/images/bootcamp/bootcamp_4_issues.jpg differ diff --git a/images/bootcamp/bootcamp_4_org.jpg b/images/bootcamp/bootcamp_4_org.jpg new file mode 100644 index 0000000..ed89b5c Binary files /dev/null and b/images/bootcamp/bootcamp_4_org.jpg differ diff --git a/images/bootcamp/bootcamp_4_pull_requests.jpg b/images/bootcamp/bootcamp_4_pull_requests.jpg new file mode 100644 index 0000000..d4b3f4f Binary files /dev/null and b/images/bootcamp/bootcamp_4_pull_requests.jpg differ -- cgit v1.3.1