search

wics-uw / website

The code that runs http://wics.uwaterloo.ca/
Other
9 stars 49 forks source link

Add git/Github website event post #45

Closed evykassirer closed 9 years ago

ehashman commented 9 years ago

Oh, one more thing, this should be a single commit. Use git rebase -i HEAD~2 and follow the instructions to squash them together. (see README/the OpenHatch git documentation if you get stuck, or ask me)

evykassirer commented 9 years ago

Will do! I wasn't sure if the rebase was for combining typo fixes or to make the whole thing one single commit. Now I know :)

evykassirer commented 9 years ago

sorry I know I need to rebase them together but I kept going back and forth between rebasing and then git would say I needed to pull again? Anyways, will fix once it's close to being ready

ehashman commented 9 years ago

Hey Evy, take a look at the network tab for a pictorial view of what your commit tree looks like. Somehow your three commits diverged and then you merged them together? I'm a bit confused as to how that happened. Anyways, you won't be able to rebase them with a merge commit on top. We should chat about how to fix that.

Once you rebase, you've rewritten your git tree, so if you are tracking a remote branch and you check your status, it will tell you your branches have diverged and there's different stuff remotely than there is locally. That's to be expected.

evykassirer commented 9 years ago

Wanna just chat about this tomorrow after our meeting? And can you ping Yamna for the FAQ?

On Sun, Mar 1, 2015 at 8:27 PM, Elana Hashman notifications@github.com wrote:

Hey Evy, take a look at the network tab https://github.com/wics-uw/website/network for a pictorial view of what your commit tree looks like. Somehow your three commits diverged and then you merged them together? I'm a bit confused as to how that happened. Anyways, you won't be able to rebase them with a merge commit on top. We should chat about how to fix that.

Once you rebase, you've rewritten your git tree, so if you are tracking a remote branch and you check your status, it will tell you your branches have diverged and there's different stuff remotely than there is locally. That's to be expected.

— Reply to this email directly or view it on GitHub https://github.com/wics-uw/website/pull/45#issuecomment-76646301.

ehashman commented 9 years ago

I manually merged this; something really wonky happened and you had duplicate commits.

annalorimer commented 9 years ago

Argh weird.