Day 18, Merging Everything

March 18, 2026

Day 18, Merging Everything

    Merge day. Or at least the first of two merge days, because pulling together multiple branches from three different people working on three different parts of the same system is not something you rush through in a single afternoon.

    We started the merging process today and it went about as smoothly as you can realistically expect. There were moments where things aligned perfectly and moments where two parts of the code that were written separately suddenly had to figure out how to coexist. Nothing catastrophic, but it required attention and patience and a lot of back and forth between the three of us to make sure we understood what each person had written well enough to resolve the conflicts cleanly.

    I think the fact that we had been in constant communication throughout the week helped a lot. Because we had been checking in with each other about our progress and our approach, the merge did not feel like opening a box of unknowns. We had a rough idea of what everyone had built, which made the integration less chaotic than it could have been.

    We did not finish everything today. There is still more to carry into tomorrow, but the bulk of the heavy lifting happened and the project is in a much more unified state than it was this morning. That counts for something. Less coding stress this week overall, which I will take gratefully.

Comments

Post a Comment

Popular posts from this blog

First Day on the Job - Orientation (February 23, 2026 | Monday)

Image
  February 23, 2026 First Day of OJT: Orientation, Meetings, Assignments and New Milestones to reach      Today marked the official start of my On-the-Job Training, though it took way more time for us to get approved, it came clear that this is the time we stride our feet and arms, and honestly, it was a bulk load of information, expectations, and excitement. We three, I, Vincent and Kristel walked into the Dean's office of Bicol University - East Campus this morning with a mix of nervousness and anticipation. First days are always like that, aren't they? Morning Orientation (9:04 AM - 11:30 AM)      Our orientation was scheduled for 9 AM to 12:00 PM, but we actually started a bit earlier at 9:04 AM and ended around 11:30 AM. The session covered all the essentials we needed to know to get started.      We were introduced to the non-teaching staff who manage various departments these are the people we'll be coordinating with for administr...
Read more

Figma is the Tool of Socrates

 March 4, 2026 Day 8, Back to Designing and Learning How DTR Works      The day after a presentation is always a bit of a reset. We spent most of today going through the feedback from the Engineering Department point by point and figuring out which parts needed minor adjustments and which needed a more significant redesign. It is actually a more difficult task than designing from scratch in some ways, because you have to balance the original design intent with the new requirements that came out of the feedback session.      We divided the comments into two categories, the quick fixes that we could handle in a day or two, and more involved changes that would require rethinking certain modules. The goal is to have everything updated and ready to present again by Monday, March 9. That gives us just a few days to turn things around, which is tight but doable if we stay focused.      On a completely different note, today I also learned ab...
Read more

Tuesday First Day of the Coding Phase

Image
March 10, 2026 Day 12 — First Day of the Coding Phase        There is something that feels different about a day when you finally stop designing and start building. Today was that day. We officially entered the coding phase of the Document Management System, and even just starting setting up the environment, laying down the initial structure, writing the first few lines, felt like a significant shift in the project's energy.      We spent a portion of the day planning how to divide the work among the three of us. Since we are a small team working on a real system with a real deadline, coordination matters more than it would in a school project. We agreed on dividing the tasks into smaller units, assigning each one on GitHub, and setting internal deadlines so that everything converges in a grand merge next week when each piece is supposed to come together. It is a simple enough plan on paper, but the execution will depend on how disciplined we each are ...
Read more