HyperWiki

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision 		Previous revision
en:manual:contrib:git_contribution_guide [2022/03/30 23:06]
rachad [Clonning repos] 		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!</note> +====== Git Contribution Guidelines ======
-====== Hyperbola Source Contribution Guidelines ======+
 ===== SSH ===== ===== SSH =====
  
Line 47: Line 46:
 </code> </code>
  
-===== Clonning repos =====+===== Cloning repositories =====
  
 Now go to team/packages: Now go to team/packages:
Line 73: Line 72:
  
 <code bash> <code bash>
-git branch <user>   # example "git branch quiliro" to create a new branch+git branch <user>   # to create a new branch
 git checkout <user>   # to switch to your branch git checkout <user>   # to switch to your branch
 </code> </code>
  
-==== 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: 
  
 <code bash> <code bash>
-git add file1 file2 +git add .
-git commit -m "Add your commit comment here"+
 </code> </code>
  
 <code bash> <code bash>
-git commit -a -m "Add your commit comment here"+git commit -sam "Add your commit comment here"
 </code> </code>
  
-To push and pull from the team repository make these changes inside team/packages/extra/.git/config  
  
-<note tip>This is used to add all commits, -am might also be used to do both at the same time</note>+ 
 +<note tip>To push and pull from the team repository make these changes inside team/packages/extra/.git/config </note>
  
 ==== Change <user> to your username: ==== ==== Change <user> to your username: ====
Line 109: Line 107:
  remote = origin  remote = origin
  merge = refs/heads/master  merge = refs/heads/master
-[branch "milky-way-v0.4"] 
- remote = origin 
- merge = refs/heads/milky-way-v0.4 
 [branch "<user>"] [branch "<user>"]
  remote = origin  remote = origin
Line 124: Line 119:
 </code> </code>
  
-To merge commits to the master branch +To merge commits from master branch 
  
 <code bash> <code bash>
-git checkout master  +git checkout <user> 
-git merge <user>+git merge master
 </code> </code>
  
Line 134: Line 129:
  
 <code bash> <code bash>
-git push origin master   # to push commits to the master branch +git push   # to push commits in the current branch
 </code> </code>
  
-==== Git Revert ====+===== Reverting commits =====
  
 We countinue with more git commands We countinue with more git commands
Line 167: Line 162:
 </code> </code>
  
-==== 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 177: Line 172:
 </code> </code>
  
-==== 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 186: Line 181:
 </code> </code>
  
-==== Conclusion ====+====== Conclusion ======
  
 So, in short, you have 2 ways to push your commits: So, in short, you have 2 ways to push your commits: