Week 16 – The Merge

Hello and welcome back fellow readers and people of the inter”webs”. We are back with another weekly updates on this capstone project! It was a very successful week for our team. We were able to finally get all of our code merged together without too many issues. There are a few things that need to be fixed but outside of that, our code foundation is finally there!

Merge: We are one

As before, we were able to get all of our code finally merged into our dev/test branch. Then, we spent some time cleaning up some UI issues and discovered that like 95% of the code is working as it should be! This was a huge step for us since we are coming to our finally weeks and we need to stop developing and start debugging. The 5% that was not working, luckily, it’s something easy to fix and one of my classmates will be taking charge to get that fixed. And we have given him the green light to work in the dev/test branch, so we don’t have to try and do another merge.

If anyone knows anything about coding and merging code, you know when you see that conflict message, your blood pressure rises. For us, there was like 20 conflicts we had to fix, hundreds of lines of code to shift through, and even then, some code didn’t make it through. Mainly a few brackets which was causing some syntax errors but we got it!

Next Steps

So, not much we really worked on this week. It was mainly getting the code merged together and working. But now that we have that, we can keep moving forward to a more stable version of the code. Is it the more optimized way? No. It is going to win any awards? Possibly but most likely no. Are we going to be showing this app to anyone? 100% we will! We have a live presentation we will be performing for one of my classmates’ professors to showcase what we have done. And in doing this, it will count as our finally presentation as well that we can upload. So, we are knocking out two birds with one stone! Got to love that

Outside of that, that is all. We are getting closer and closer to our graduation date. We have 3 weeks left of class and after that, we graduate! I’ll be actually going down to Florida to walk and actually will be able to see my classmates in person for the first time! Hope you all have been enjoying this adventure with us!