10 Dec
2013
10 Dec
'13
8:41 a.m.
I have two separate local repositories cloned from the same other repository and I have made different changes to both. How do I merge those changes together using git ? Or do I have to do it manually ?