ive got some software that ive been developing that i want to put into version control
Currently ive got version1 on my server and version 2 ( gets worked on when im travelling) on my laptop.
Ive installed git on both machines and in created repos in both directories,
I want to push the laptop version as a branch on the server.
Im not sure how to go about it. Do i have to clone the server copy , onto the laptop, update the files ( ie copy them frmoa temp diretory back to the repos directory , add them locally ( git add .)
then push them to server ?
Or is there a better way of doing it ?