Alrighty. Read this before doing anything so that you don't accidentally delete our entire project...
-
Create a new branch for yourself to edit in
-
When done editing, merge your branch with the master copy. (Pull request)
-
Regularly sync your local files with the master.
-
Make sure that your branch is updated before you start editing.
-
If a conflict arises when you try to merge your branch with the master, then you have disobeyed something listed above.
Cheers