Personal tools
You are here: Home > CS 342 Blog Entries > The Cory Lewis Software Blog > The Week Ending February 24

The Week Ending February 24

by Lewis, Cory last modified Feb 24, 2017 08:08 PM

This week I got to learn more about Git and how to use it effectively. We studied it in lecture as well as an article called 'Git'. On Wednesday in the lab, we worked in teams on Git Workflow and produced some documents. We learned about squashing, about how to merge conflicts, and overall use the Git command line more effectively.

Levi and I had a lot of issues trying to get our personal forks to update properly. Cooper tried to help as much as possible but was as confused as we were. Finally, we figured out - thanks to another team - that we had to explicitly define Cooper's main repository as the 'upstream' origin. Beyond that, it was smooth sailing.

We also narrowed down our ideas to Gamification and adding a GUI to view and add buildouts to Plone. Based on feedback from Kim, the Gamification idea may be the one we go with (Kim seems to be into that idea).

For this next week I look forward to studying the chapter I picked in the 500 lines or less book and figuring out how to modify it. I also look forward to my teams first stand-up meeting so we can figure out which idea we will go with for out project and try to flesh it out a little more.

by Lewis, Cory last modified Feb 24, 2017 08:08 PM
CS emphasis accredited by

ABET logo

Contact Us

Computer Science Department
UW Oshkosh
800 Algoma Blvd.
Oshkosh, WI 54901

Phone: (920) 424-2068
Fax: (920) 424-0045
Building: Halsey Science Hall

Rooms: 229 (general office), 218 (George Thomas, chair)

Email: Send mail to chair at