niektb Posted March 16, 2015 Report Share Posted March 16, 2015 (edited) I thought it might be a good idea to explain to you how to make the most of your git(hub) repository and work effectively in a team or make sure your master branch is always clean and stable.That's where one of git's most powerful feature comes in: branching. Let's kick right off!In this tutorial I'll be using the Github for Windows client as I experienced it to be intuitive and user-friendly. Also I'll use Aristeia as example.Righto, in your program create a new branch. Do so by clicking the '+' button as shown in the image below:Give it a name and the program should show something like this:Make the changes you want. Now we need to publish the branch to make it available to others (you can also make changes after you published your newly created branch):Open your browser and go to you Github page, if you did everything correctly you can now see your branch online:If you think your changes are ready to commit, click on the green 'Compare & pull request' button. After that your screen should show something like this:Give it a name and a description and click on the 'create pull request' button. There you go, a pull request is created and it directly offers a discussion thread. Other team members are also notified of your pull request:If other people noticed bugs you can append new commits in your github for windows client. If they think the pull request is good enough they can merge it (or you can do it yourselves if you have the rights to do so):Tada! You're changes have landed into the master branch! You can now delete your branch or use it for further development (and create a new pull request over time) Edited March 16, 2015 by niektb 3 Quote Link to comment Share on other sites More sharing options...
Lion.Kanzen Posted March 17, 2015 Report Share Posted March 17, 2015 Can be nice Add to your tutorial a glossary of terms Quote Link to comment Share on other sites More sharing options...
niektb Posted March 17, 2015 Author Report Share Posted March 17, 2015 What terms don't you understand? Quote Link to comment Share on other sites More sharing options...
Lion.Kanzen Posted March 17, 2015 Report Share Posted March 17, 2015 Branch is some like repository ? Or version of repo?Other terms for noobs can be nice to addPullPushCommitStashFetch I'm using Tortoise Git client for Windows Quote Link to comment Share on other sites More sharing options...
sanderd17 Posted March 17, 2015 Report Share Posted March 17, 2015 Pull = get something Push = send something Commit = give a version number to some change Not sure what fetch is, or when you need it For Branch, you have to know that every repo has at least one branch (usually the Master branch). You can copy a branch into a new branch. That way you can work on something, without interrupting the master branch. When your work is done, you can merge the two branches again. Quote Link to comment Share on other sites More sharing options...
fcxSanya Posted March 17, 2015 Report Share Posted March 17, 2015 Pull = get something <...> Not sure what fetch is, or when you need itFetch is 'get something' and pull is fetch + merge Quote Link to comment Share on other sites More sharing options...
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.