I’m currently in my first year of computer science, and every week we get new assignments to update our program and add features to it, so every week we come together and assign everybody a few of those assignments to finish and eventually manually merge to hand it in. But to manually merge them, we have to upload our code to pastebin and send it over, but this way we easily lose track of what code does what and if we updated that snippet recently. So I thought why not use github, but github has so much features I became a bit overwhelmed.
Eventually I made a repository and made a branch for every member of my team. So in intelliJ, we can edit the code simultaneously and upload it to github. And then merge everything and update everyone’s branch. But I’m coming to the conclusion this might not be the best way to collaborate.
So my question is: Is there a better way to do this? Does github provide a feature for this? Or should I use something else?