Capstone Project - Week 13

This week, I merged the development branches into our CSV and user-forked branches.  For the User branch, this was trivial and didn't take a long time.  However, the CSV branch had many conflicts that took a few hours to go through and make sure the correct code from both branches made it into the merged branch. The two branches both had some automated tests fail as they were designed for the previous versions of the code that myself and my team had altered. I worked to fix the CSV tests that failed to have them test properly against our new versions and pushed the code.

Our Project Manager has now reviewed the code again and has some additional requested changes so I will work to get these completed and have it reviewed once more. 

The main challenges are the Pull Requests I am working on are quite large and major pieces of the codebase, so they are scrutinized more and our Project Manager has specific requirements, so there is a lot of code to continually review, alter, and troubleshoot issues along the way.  I do enjoy working on the project and plan to see these PRs through.

Comments

Popular posts from this blog

Learning Journal Final Entry...

Software Engineering - Week 8

Computer Networks - Week 8