Git commits and branches

In order to show the progress of development and to show a bit a version control / history. We are tasked with doing frequent git commits and making branches. The commits should contain a message of what has been done in that commit. The branches should be used to work on a specific feature or bugfix. When the feature or bugfix is done, the branch should be merged back into the main branch or into a development branch which will be pushed to the main when everything is done.

When it comes to commits. I've been committing every few changes. For example: when I finish the content of one of these portfolio pages I don't commit it immediately but wait for a bit more content.

As you can see above, I've done commits more on some days than others but when I commit some content I tend to do more than just one page. On the 6th of May for example. The first commit I've done this day is updating the sidebar on every page I had at the time and added a disabled component class for buttons which didn't work yet. I've also merged the content-page branch to the main on this day.

I decided to create the wireframe of all the content pages in a separate branch and merge it once this was finished. This is exactly what happened on this day. After merging I sadly deleted this branch but I have some other examples from the AI weirdness project.

As you can see above, in the AI weirdness project we made several branches for each feature / page. The branches I worked in are the HomePage, ProfilePage and LoginPage. 2 of these branches were deleted after merging and the HomePage is still there for when we had to make any changes.