search

hshackers / docs

Documentation for HS Hackers
hshackers.org
30 stars 56 forks source link

Add Wilson Zhao #49

Closed wilzh40 closed 10 years ago

wilzh40 commented 10 years ago

Wilson Zhao

zachlatta commented 10 years ago

Can you remove the space from the empty Twitter field? Remember to amend the current commit, not create a new one.

wilzh40 commented 10 years ago

Got it.

kevinji commented 10 years ago

Combine the two commits into one! Do an interactive rebase (git rebase -i HEAD~2), squash the second commit, fix the commit message, then force push (git push -f).

wilzh40 commented 10 years ago

My b, this is my first time editing using the github website to edit commits haha

zachlatta commented 10 years ago

Once you follow @mc10's instructions and give the commit a sensible name, I'll go ahead and merge.

wilzh40 commented 10 years ago

Brb opening up command line

zachlatta commented 10 years ago

:thumbsup:

Zach Latta http://zachlatta.com https://github.com/zachlatta https://twitter.com/zachlatta

On Mon, Jul 7, 2014, at 11:41 PM, Wilson Zhao wrote:

Brb opening up command line

—

Reply to this email directly or [1]view it on GitHub.

References

  1. https://github.com/hshackers/docs/pull/49#issuecomment-48277292
wilzh40 commented 10 years ago

Two problems, I have no idea how to access a pull request in github using git, much less using git rebase on it. I'm also getting access denied 403 error when I created a new commit and pushed using bash.

kevinji commented 10 years ago

Uhh try these steps out:

  1. Clone your repo (git clone https://github.com/wilzh40/docs.git), then cd into it.
  2. For convenience, add the original repo as upstream (git remote add upstream https://github.com/hshackers/docs.git).
  3. Create a new local branch patch-1 (git checkout -b patch-1).
  4. Pull this branch patch-1 (git pull patch-1).
  5. Follow my steps above, except instead of git push -f, use git push -f -u origin patch-1 to allow this branch to track the remote branch.
wilzh40 commented 10 years ago

Step 4 doesn't work, I can't pull anything using git pull origin patch-1

kevinji commented 10 years ago

That's really odd; is there an error message that shows up?

wilzh40 commented 10 years ago

It worked!...Kind of?

wilzh40 commented 10 years ago

Thanks Kevin, I'm learning new things about Git every day haha

zachlatta commented 10 years ago

:thumbsup:

@mc10 you did a great job explaining and helping @wilzh40 through the process. :shipit: for you.

kevinji commented 10 years ago

You bet!