This is open to discussion but this is what I think we should do as we are in a group.
All New Code should be put in a new function, You should not edit code in other functions! This will avoid a lot of merge conflicts that WILL happen.
If you do need to edit previous code, the person that created the function should be the only person that changes the code. We can also change this to, whoever is assigned to issue with where the bug is should be only one touching the code in that function.
Everything being in one file we need to figure things out so minimize how many merge conflicts we have.
This is open to discussion but this is what I think we should do as we are in a group.
All New Code should be put in a new function, You should not edit code in other functions! This will avoid a lot of merge conflicts that WILL happen.
If you do need to edit previous code, the person that created the function should be the only person that changes the code. We can also change this to, whoever is assigned to issue with where the bug is should be only one touching the code in that function.
Everything being in one file we need to figure things out so minimize how many merge conflicts we have.