I have to confess, I'm quite lacking the knowledge about the working of git and the workflow for this VCS.

Most usecases are fine, really. I can:

  • CGI-Edit stuff on Webserver
  • CGI-Edit stuff on Laptop
  • push Laptop-Stuff to Webserver
  • pull Webserver-Stuff to laptop

But sometimes it happens that I changed some stuff on the Webserver as well as wrote some stuff on the Laptop ... I believe thats called branching; of course, it is.

I already managed to solve this stuff somehow with an conglomerate of push pull and commit actions but I have no idea, why this really merged the branches.