Closed PatriciaTanzer closed 6 years ago
About the idea of squashing the commits before merging-
I did some checking. Github does NOT count your contributions if it was part of a merge that was squashed! Only the users who open the request and who click the 'merge' button will actually get credit. So let's not do that.
Here's the link to the help page I found that on: https://help.github.com/articles/why-are-my-contributions-not-showing-up-on-my-profile/
This sounds like a good idea, I should have all my stuff within develop by this afternoon.
@PatriciaTanzer I added a blank progress_report_1_10_20.txt file to develop for the progress review. You can go in and edit it to look a certain way or remove it and add a new one. I just know that from reading the requirements for the graded progress Mohanty wants each of us to log in that or a similar document and have that in Master.
Just a heads up to everyone, I just created #48 which I'll be working on readying for merge tonight. LMK if you see any outstanding issues. I'll make sure that the changes don't touch anyone else's code--if there's no feedback though I'll just go ahead and do the merge.
Hopefully next time we'll all be ready in plenty of time before the evaluation date :-)
@brownworth @smindinvern @PatriciaTanzer don't forget to edit progress_report_1_10_20.txt file in docs with your contributions. "Missing your GitHub contribution or not outlining the tasks performed in the progress document will result in 0 for the grade." 👍
@mtellis2 fffffffuuuuuuuuuuuuuuuu-
Thanks for the reminder... that would have been bad!
Might I suggest we make this a markdown document? That way we can actually include direct links to the notebooks to make it easy for Dr. Mohanty to browse.
yeah that sounds good to me
See e.g. here
OK, had some issues there, but it's formatted properly now....
Alright, seeing as it's the 20th, I'm going to do the merge, just on the off chance that he decides to start grading at 8am.
@PatriciaTanzer, it looks like you still need to update the contributions document, and @brownworth, you still need to update that doc and merge your branch. Don't forget! :-)
I just got to that. However, I should point out we need to put our goals in the README. It's fine having a progress report, but remember how he looked at the README first last time? It shows what we plan to work on for the next section. @mtellis2 @smindinvern @brownworth
I left my laptop's power adapter at a conference earlier this week, and I just got back from the store buying one. I will wrap it up today.
I have made my changes to the progress report, and updated the documentation where appropriate. There were far too many issues with the brown branch to properly merge, so I deleted it and manually uploaded files where there weren't conflicts. Hopefully nothing has been adversely affected. Please let me know if there are any problems.
As we're being graded again in two days, we probably should update master at least by the morning of the 20th, if not the night before.
Let's commit whatever we want in master to develop by that point.