search

decause / hflossk

HFOSS + Flask = hflossk
Apache License 2.0
38 stars 70 forks source link

Update snapschott.yaml #632

Closed snapschott closed 9 years ago

snapschott commented 9 years ago

Added Quiz

decause commented 9 years ago

@snapschott be sure to git pull and merge upstream. Cannot auto-merge.

ryansb commented 9 years ago

Grumble grumble merge bubbles.

decause commented 9 years ago

@ryansb :heart_eyes_cat:

ryansb commented 9 years ago

@decause I have no idea what that emoji is supposed to mean.

@snapschott please try this instead.

git fetch https://github.com/decause/hflossk.git HEAD:decauseMaster
git checkout decauseMaster # get the master branch from Decause's repo
git checkout master -- scripts/people/2014/fall/snapschott.yaml # get the changes you have in this PR
git commit -m 'Update snapschott.yaml' # commit those changes
git push -f origin decauseMaster:master # overwrite your master with your updated changes

Then you will be able to open a new PR that will merge correctly.

decause commented 9 years ago

@snapschott you got this?

snapschott commented 9 years ago

Yeah, I'll fix it

On Tue, Dec 16, 2014 at 1:37 PM, Remy DeCausemaker <notifications@github.com

wrote:

@snapschott https://github.com/snapschott you got this?

— Reply to this email directly or view it on GitHub https://github.com/decause/hflossk/pull/632#issuecomment-67208504.

snapschott commented 9 years ago

Okay I made a new pull request that hopefully fixed the quiz2 merge problem and added the finalpreso

On Tue, Dec 16, 2014 at 3:02 PM, ANDREW SCHOTT (RIT Student) < afs7827@rit.edu> wrote:

Yeah, I'll fix it

On Tue, Dec 16, 2014 at 1:37 PM, Remy DeCausemaker < notifications@github.com> wrote:

@snapschott https://github.com/snapschott you got this?

— Reply to this email directly or view it on GitHub https://github.com/decause/hflossk/pull/632#issuecomment-67208504.

ryansb commented 9 years ago

Looks great, I'm going to close this PR then.