Skip to content

Conversation

@dfugelso
Copy link
Contributor

@dfugelso dfugelso commented Oct 8, 2014

No description provided.

PythonCHB and others added 30 commits September 28, 2014 17:53
mark updating of codefellows mentions as completed
Added SSCwafel directory and a test file
@PythonCHB
Copy link
Contributor

Wow! this has gotten rather tangled up... were you expermenting during Cris' class?

We may need to re-clone and start again -- let's see if we can clean this up before or after class this week.

@dfugelso
Copy link
Contributor Author

Well, yea.

I'm new to Github's 'Request Pull' mechanism. Should I have just
requested one pull even though I did a commit between pulls?

All my files look okay, btw. Did I mess up something else?

Dave

On Oct 11 2014 3:02 PM, Christopher H.Barker, PhD wrote:

Wow! this has gotten rather tangled up... were you expermenting
during Cris' class?

We may need to re-clone and start again -- let's see if we can clean
this up before or after class this week.

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

Links:

[1]

UWPCE-PythonCert/ProgrammingInPython#5 (comment)

@PythonCHB
Copy link
Contributor

well, a single pull request is tied to a branch. So if you make one request then, commit a change to that branch, it will automatically get added to teh pull request, if I haven't merged it yet.

But this issue here is that there is a LOT of changes all over the repo in this pull request. It looks like you were experimenting with merging in stuff from various other repos and branches.

See if you can see the whole list of changes in your pull request -- it's big!

A real git master could figure out how to clean this all up, but I suggest you may want to essentially start over -- do a new clone of the main repo, and then put your stuff back in by hand.

-Chris

meshmote and others added 13 commits October 11, 2014 15:00
… 20th term correctly. Contains a useful docstring and some assertions for some basic testing.
…erm of the lucas function. Checked that it gives the correct result up to the 20th term of the Lucas fuction. Added some basic assertion tests.
…roth and first terms to give the nth term of the Fibonacci series. Will give nth term of arbitrary series given users specified zeroth and first terms to work from. Some basic assertion tests to show it computes the correct nth term in the series and a docstring giving some details on what the function does.
Adding session02 homework

Looking good!
Ian M. Davis Homework

Love those docstrings!

Very nicely done.

One thing -- it's not really worth catching the AssertionErrors -- they will get hit anyway, so not a lot of value added. But good form for Exceptions in general.
@PythonCHB
Copy link
Contributor

closing this -- re-submit when it's cleaned up.

@PythonCHB PythonCHB closed this Oct 13, 2014
@dfugelso
Copy link
Contributor Author

Hi Chris-

I see what I did... that pull request number 5 is actually trying to
merge gh-pages with master instead of my master with the class' master.

I did a later pull request for session 2 homework and everything is
merged in, although commit comments are a bit messed up.

Anyway, I think I'm good.

Dave

On Oct 13 2014 12:29 PM, Christopher H.Barker, PhD wrote:

closing this -- re-submit when it's cleaned up.

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

Links:

[1]

UWPCE-PythonCert/ProgrammingInPython#5 (comment)

@PythonCHB
Copy link
Contributor

yup -- looks good now.

One suggestion -- avoid names with spaces in them. the tool sall work with them, but command line usage is a little uglier -- you need to escape the spaces, or use quotes.

I use underscores or "StudlyCaps" to get easy to read names without spaces.
-Chris

@dfugelso dfugelso mentioned this pull request Nov 4, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants