Tag: Github

The GitKraken app is a GUI for Github. Some people may prefer a GUI solution. The video above will give an impression of the app.

• Download GitKraken here.

Branches

A strong feature on Github is the concept of brances. Here you may experiment with some code. Later on the experiments can be merged with the master code ( origin master ).

1. Create a branch.
2. Chekout the branch ( that is: work on the branch ).
3. Edit the file.
4. Make sure that the branch is chosen.
5. Stage the changed file(s).
6. Edit the commit message.
7. Push to Github.

Go to Github. If everything is ok the changes should be stored.

Merge a branch to origin master

When you’re satisfied with the code in the branch, you may want to merge the new work with the stem of the tree. The stem is called ‘origin master’. In GitKraken rightclick on remote / master. A popup menu will let you merge from the branch to the master:

 

Click on the merge option. Then write a commit message, and click on Push.

On the Github web page you’ll be able to follow all the comitted changes:

Above you see the content of the file, and the history. The image below is the online version of the branches:

( The screencast and screendumps were made on a Ubuntu Linux system. )