Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
en:manual:contrib:git_contribution_guide [2022/03/30 23:31] rachad [This is the config file found in GIT/team/packages/extra/.git Change <user> to your username:] |
en:manual:contrib:git_contribution_guide [2023/02/22 20:26] (current) throgh [Clonning repos] |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | <note warning> This page is still in progress, so please dont aprove this draft yet!</ | + | ====== |
| - | ====== | + | |
| ===== SSH ===== | ===== SSH ===== | ||
| Line 47: | Line 46: | ||
| </ | </ | ||
| - | ===== Clonning repos ===== | + | ===== Cloning repositories |
| Now go to team/ | Now go to team/ | ||
| Line 77: | Line 76: | ||
| </ | </ | ||
| - | ==== Edit, add and remove files ===== | + | ===== Edit, add and remove files ====== |
| Create the files you want to add to extra repository and type: | Create the files you want to add to extra repository and type: | ||
| Line 133: | Line 132: | ||
| </ | </ | ||
| - | ==== Git Revert | + | ===== Reverting commits ===== |
| We countinue with more git commands | We countinue with more git commands | ||
| Line 163: | Line 162: | ||
| </ | </ | ||
| - | ==== Git rebase | + | ===== Rebasing codebase ===== |
| However, please don't use this command in master, for that reason i'm insisting for each user to create their own branches. | However, please don't use this command in master, for that reason i'm insisting for each user to create their own branches. | ||
| Line 173: | Line 172: | ||
| </ | </ | ||
| - | ==== Git push ==== | + | ===== Pushing changes ===== |
| Remember to push those commits to master and milky-way-v0.4 branches if you consider those ones stable and tested by you first because I will pull them to our build server to build and push to repos. | Remember to push those commits to master and milky-way-v0.4 branches if you consider those ones stable and tested by you first because I will pull them to our build server to build and push to repos. | ||
| Line 182: | Line 181: | ||
| </ | </ | ||
| - | ==== Conclusion ==== | + | ====== Conclusion |
| So, in short, you have 2 ways to push your commits: | So, in short, you have 2 ways to push your commits: | ||