
10 Dec
2013
10 Dec
'13
8:51 a.m.
2013/12/10 Edward Diener
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 ?
maybe git cherry-pick might help