Popular posts

Well, I did use the commandline for my own git, which is basically just a master. So the basics of add > commit > push is clear to me. Now that there's a branch involved it gets weird somehow. :S

Yes, it does get a little murky when starting to work with branches outside master. If you know the basics, I still suggest going through that tutorial. Start with remotes: git-scm.com/book/en/v1/Git-Basics-Working-with-Re… Then work your way through the branches section: git-scm.com/book/en/v1/Git-Branching-What-a-Branc…

What you're probably looking for is git merge origin/master if you're currently in your other branch.

Remember, everything you run, runs on your local git repo unless you explicitly tell it to make use of your remote repo.

I'm seriously considering going to CLI for this now... ;) Will check the tutorials first! Thanks :)