@@ -53,54 +53,3 @@ Contributeurs
53
53
> Roi du bit audio.
54
54
- gravgun
55
55
> Guerrier des base de données et entretienneur de mods.
56
-
57
- Note to developpers
58
- ===================
59
-
60
- Recently many changes have been made in the repository. New methods have been
61
- adopted for pushing/pulling from the repository. You will find here the most
62
- importants
63
-
64
- ### When you are pushing
65
- After committing, you will need to reproduce your changes on parallel branches.
66
- For example, if you commit on master :
67
-
68
- > git format-patch HEAD~<amount of commits to reproduce> --stdout > patch_for_branch.patch
69
- > # Created a .patch file to apply commits on the other branch
70
- > git checkout <parallel branch>
71
- > git am ./patch_for_branch.patch # Apply the patch
72
- > git push origin <parallel branch>
73
-
74
- If you want to see which files are being modified, or how many lines are added :
75
-
76
- > git apply --stat < patch_for_branch.patch
77
- another_file.txt | 0
78
- another_file.txt | 0
79
- 2 files changed, 0 insertions(+), 0 deletions(-)
80
- >
81
-
82
- If you want to check whether or not you will have to resolve merge conflicts :
83
-
84
- > git apply --check < patch_for_branch.patch
85
-
86
- If you get errors, then git am will require you to solve merge conflicts.
87
-
88
- ### When a parallel branch cannot be pulled
89
- WIP works are often put on parallel branch to not disturb simple
90
- updates or fixes for mods (even if they should be reproduced on these
91
- branches as shown above). However, there might be problems, requiring
92
- devs to 'forcepush' on the branches.
93
- __ * Note:* __ It will never happen on ` master `
94
-
95
- If you cannot pull, then, here is what to do :
96
-
97
- > git checkout master
98
- > git branch -D <parallel branch>
99
- > git checkout -b <parallel branch>
100
- > git branch --set-upstream-to=origin/<parallel branch>
101
- > git pull origin <parallel branch>
102
-
103
- This will delete your copy of the branch, create a new one, and replace
104
- it with the remote content. You can also :
105
-
106
- > git pull --force
0 commit comments