Hello ,
I'm a Git newbie. I could not get a clone onto the server directly via SSH, 
so I rsync it and continued to work as usual.  I've done commits on both, 
added different files and directories on both repositories, and felt that 
it was time to merge.  However, now that I would like to now merge the 
repository on the cluster, with the one on my computer, git complains that 
both repositories are masters, which in hindsight seems obvious since I did 
not create branch.  I would greatly appreciate any help on how to merge the 
two.  My laptop is a macbook pro running git version (Apple 
Git-48), the cluster has git version 1.7.1.

Thanks !

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to