Sunday, May 4, 2014

The Final Merge

Currently our project has switched in to a mostly test mode. Almost all of the code that we are writing is just tests and bug fixes. We do have a minor issue that we hope to resolve tomorrow, two separate branches that need merging.

We diverged about a week ago to clean up the last two tasks in the application, and we have not had a chance to bring them back together yet. I don't anticipate any issues with the merge, but it is rather discomforting to not have it handled yet.

After this merge, I will sleep better. (Well, probably not, but one can hope...)

No comments:

Post a Comment