Xfce Wiki

Sub domains
 

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
contribute:dev:git:start [2020/08/28 08:44] – Added info that fork permission is required alexxconscontribute:dev:git:start [2024/04/14 10:35] (current) – [GitLab Forks and Merge Requests] gael
Line 4: Line 4:
   * **[[start#Introduction|Introduction]]**   * **[[start#Introduction|Introduction]]**
   * **[[start#Setting your Git credentials|Setting your Git credentials]]**   * **[[start#Setting your Git credentials|Setting your Git credentials]]**
-  * **[[start#Git usage example on an Xfce project|Git usage example on an Xfce project]]**+  * **[[start#Git usage example on an Xfce project|Git usage example on an Xfce project]]**  
 +  * **[[start#Commit Guidelines|Commit Guidelines]]**
   * **[[start#GitLab Forks and Merge Requests|GitLab Forks and Merge Requests]]**   * **[[start#GitLab Forks and Merge Requests|GitLab Forks and Merge Requests]]**
   * **[[start#Git rules on gitlab.xfce.org|Git rules on gitlab.xfce.org]]**   * **[[start#Git rules on gitlab.xfce.org|Git rules on gitlab.xfce.org]]**
Line 107: Line 108:
 ===== GitLab Forks and Merge Requests ===== ===== GitLab Forks and Merge Requests =====
  
-If you want to contribute code the best way is to get a contributor's account and fork the project you would like the contribute to and file a [[https://docs.xfce.org/ee/user/project/merge_requests/|merge request]]. +If you want to contribute code, the best way is to get a contributor's account and fork the project you would like to contribute to and file a [[https://gitlab.xfce.org/help/user/project/merge_requests/index.md|merge request]]. 
-  - Fork the project (Ask for fork permissions [[/contribute/start#communication|on the mailing list or in IRC]] ) +  - Ask for fork permissions [[/contribute/start#communication|on the mailing list or in our Matrix channel]] 
-  - Clone your fork +  - Fork the project via the GitLab UI 
-  - Create a new branch (try to use a descriptive name), don't use "master"+  - Clone your fork locally 
 +  - **Create a new branch** (try to use a descriptive name), don't use "master" (otherwise we cannot rebase and merge your branch)
   - Change and push your code to your fork/branch   - Change and push your code to your fork/branch
   - Start a merge request and [[https://docs.gitlab.com/ee/user/project/merge_requests/allow_collaboration.html|allow maintainers to change your branch]] (this means maintainers can rebase your branch on top of master using the GitLab Web UI)   - Start a merge request and [[https://docs.gitlab.com/ee/user/project/merge_requests/allow_collaboration.html|allow maintainers to change your branch]] (this means maintainers can rebase your branch on top of master using the GitLab Web UI)