diff --git a/README.md b/README.md index a083d059..7ed94682 100755 --- a/README.md +++ b/README.md @@ -53,54 +53,3 @@ Contributeurs > Roi du bit audio. - gravgun > Guerrier des base de données et entretienneur de mods. - -Note to developpers -=================== - -Recently many changes have been made in the repository. New methods have been -adopted for pushing/pulling from the repository. You will find here the most -importants - -### When you are pushing -After committing, you will need to reproduce your changes on parallel branches. -For example, if you commit on master : - - > git format-patch HEAD~ --stdout > patch_for_branch.patch - > # Created a .patch file to apply commits on the other branch - > git checkout - > git am ./patch_for_branch.patch # Apply the patch - > git push origin - -If you want to see which files are being modified, or how many lines are added : - - > git apply --stat < patch_for_branch.patch - another_file.txt | 0 - another_file.txt | 0 - 2 files changed, 0 insertions(+), 0 deletions(-) - > - -If you want to check whether or not you will have to resolve merge conflicts : - - > git apply --check < patch_for_branch.patch - -If you get errors, then git am will require you to solve merge conflicts. - -### When a parallel branch cannot be pulled -WIP works are often put on parallel branch to not disturb simple -updates or fixes for mods (even if they should be reproduced on these -branches as shown above). However, there might be problems, requiring -devs to 'forcepush' on the branches. -__*Note:*__ It will never happen on `master` - -If you cannot pull, then, here is what to do : - - > git checkout master - > git branch -D - > git checkout -b - > git branch --set-upstream-to=origin/ - > git pull origin - -This will delete your copy of the branch, create a new one, and replace -it with the remote content. You can also : - - > git pull --force