Thanks for your response. I can see now that both at GitHub and locally I 
have indeed a new and an old branch. 

Old: master; or remote/origin/master 

New: origin-master; or remotes/origin/origin-master

I tried doing the following in the hope to bring both branches together 
again, but seemingly I misunderstood something, as that does not result in 
any change. 

$ git merge origin-master
Already up-to-date.

Sorry, but how do I merge these branches again? 


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 
For more options, visit

Reply via email to