Specifically because of the problems with git and because I know from previous sprints and previous projects that merging can take a lot longer than you think, I started merging at the start of the last week. I did not merge via git, but I imported everything the others made myself when they finished something new.
I also immediately tested everything while implementing things so that I was sure everything worked, this made me catch problems early on, for example that the cloth constraints could not be copied over. If I had noticed this after I had replaced all the clothing I would have had a lot more work with undoing everything.
Reflection
This is something I spoke about with Lisette and she told me this is something I have grown a lot in and I agree with this. This also contributed to my wish of making a finished product that is one whole thing with a beginning and an end and (almost) no game breaking bugs.