3 ms·
Do the fetch, diff against remote/branch and see what changed, look at the commit logs, and then merge.
by ori_b 15y ago
Do the fetch, diff against remote/branch and see what changed, look at the commit logs, and then merge.
- bennoleslie 15y agoSure, I would agree with that, but in this case I already knew what the one commit I was pulling did. And the fetch,diff, merge wouldn't have helped. The file that was destroyed wasn't changed in the commit that was fetched.