Activity Team/Git FAQ: Difference between revisions

Line 58: Line 58:
  [remote "origin"]
  [remote "origin"]
     url = git@github.com:username/yourproject.git
     url = git@github.com:username/yourproject.git


=== How do I request a merge? ===
=== How do I request a merge? ===


:Go to your GitHub fork page and follow the steps of the images
:Go to your GitHub fork page and follow the steps of the images
<gallery>
 
Merge-Step1.png|Click on the Pull Request button
[[File:Merge-Step1.png]] <br />
Merge-Step2.png|You will get something like that.
Click on the Pull Request button
Merge-Step3.png|If you used another branch for changes, just change it in the image
[[File:Merge-Step2.png]]<br />
Merge-Step4.png|Click on Create Pull request
You will get something like that
Merge-Step5.png|Edit the title/description of the pull request, and click on Create pull request. Now the commiter will review it
[[File:Merge-Step3.png]]<br />
</gallery>
If you used another branch for changes, just change it in the image
[[File:Merge-Step4.png]]<br />
Click on Create Pull request
[[File:Merge-Step5.png]]<br />
Edit the title/description of the pull request, and click on Create pull request. Now the commiter will review it]]


===What is the difference between a branch and a repository?===
===What is the difference between a branch and a repository?===