Weekly Check-in #7

Hello everyone!

1. What did I do this week?

I have been working on resolving the merge conflicts that came about as a result of merging the develop branch into the gsoc branch that I'm working on. Since, I hadn’t merged develop into my branch before, I had to adapt the changes that I’ve made to the new changes and refactor the tests based on the new changes. By the end of the week, I was able to successfully resolve the merge conflicts and refactor the tests for the new GUI.

2. What is coming up next?

In the upcoming week, the target would be to implement the new profile window and get started with the implementation of the new configuration editor.

3. What did I learn during this week?

I learned that it was a standard practice to periodically merge the active development branch, in our case the ‘develop’ branch, into the branch I’m working on, to get the latest changes and proceed with my work based on that.