Install teamwork tools: Git, GitKraken and Atom code editor

Introduction

If you are the first in your team, then create the Git repository and share it with the other team members, otherwise just skip to install Git for Windows and install the Git command line tools and Git graphical tool GitKraken. The Atom code editor is a modern text editor with many extensions for Docker file syntax highlighting, PowerSheel shortcuts and much more. After following the steps below, read how to install Docker for Windows.

In GitKraken “File” menu, under “Preferences”, “Authentication”, press BitBucket.org and connect to your BitBucket account. Now press the “Generate SSH key and copy to clipboard”, to make a SSH key instead of using password each time.

In GitKraken under “Preferences”, we can now make a local work copy (clone) of the private repository. Select the local folder like “C:\Data\Git\lisbergio” and the private repository.

You are now ready to test your new repository by adding new or modifying existing files. When new files are added in your local work folder “C:\Data\Git\lisbergio\private”, then GitKraken will offer to view changes and you can create (stage) new files or accept changes to existing files (commit). Remember to add a summary or description to make it easier for others and yourself to know what was changed.

After new files and changes to existing files are committed to your local repository copy, you must “Push” them to the shared BitBucket private repository for your team members to see them.

At least each day before you start working you must “Pull” any changes other team members have made. If there are any conflicts with your local and the shared code, these must be resolved.

To avoid conflicts when you push your changes to the shared BitBucket repository, it’s a good idea to first “Stash” your local changes, “Pull” the latest changes and then “Pop” your stashed changes, so they are merged with the latest code. If everything still works, then you most likely will be able to “Push” your changes, without any conflicts.