At this point, you have created a git repository and have successfully invited your girlfriend to make changes to the files within it. However, left unexplored was the possibilities brought about by the branch feature. Branches are the core of collaboration.
Since you created the project, you’re by default the project owner. You can switch or share this power and responsibility so long as all the voices in your head agree to it. Hierarchy is important. Order is established when there is someone to blame.
The ‘main’ branch contains the live code. It is the reference point of whatever code the relationship runs. To view another branch, you can perform a ‘git checkout’. Checkout allows you to hop between branches. So if you needed to checkout what was happening at branch ‘she-dev’; all you need to do is type ‘git checkout she-dev’. This will shift your current code in view to whatever is in that branch. To get back to your own or another, just use the command in a similar manner.
Important to note: before performing a checkout, either; have your changes committed or perform a ‘git stash’. A ‘git stash’ simply takes all your changes and stashes them. To ‘pop’ the stash or re-write the stashed changes, just type ‘git stash pop’. Stashes can be as many as you would like. A pop will unleash the changes performed by the latest stash and so on. Stashes are stored on a stack.
Checkout can do much more than hop between branches. It can help you move in time. Typing ‘git log’ gives a rundown of your commit history. In the detail is a commit hash, always guaranteed to be unique. Typing ‘git checkout <hash>’ with the <hash> being the unique number will take you to work as it were within that commit.
To take in work from a branch, say, she-dev, simply use ‘git merge she-dev’. This will take all of the work done in the branch ‘she-dev’ to whatever branch you are at currently. It could be he-dev or master. Remember, master is the law, branches are the trials.
Under ordinary situations, the above knowledge would suffice the management of basic projects. In time however, things will get elaborate and then; we will expound on this. With the mentioned; one can create and collaborate on elaborate projects comfortably.