Disclaimer: I am not entirely comfortable with the more nuanced functionality of Git.
Hi, I own a private repository that I have invited a friend to collaborate on. We’re working on a Unity project and at some point I decided to make a branch to explore an alternative implementation to something. I also seemed to have changed the default branch to that branch because I preferred the alternative implementation. I believe the collaborator joined after this switch.
A couple weeks ago I decided to merge the branch into master and start working primarily from master again. The collaborator was not able to see any changes I had made to master, so I tried switching the default branch back to master. Still no luck.
I want us to both be able to push and pull on the master branch. What do I do to make this happen?