message no. 176157
Posted by diverdude in #github at 2019-11-27T19:59:12Z
I have a file A which is in git repository. I have another version (B) of A which is not in git repository. B has been updated outside repository and I want to merge it back into A. How do I do that?