Daniel Shahaf
2017-08-02 14:47:38 UTC
Translation: The newly added newfile.txt is completely unrelated to the previously existing newfile.txt you are merging from.
JP, note that Andrew was assuming here that the status is reallyjust "A". If the status is "A +" then Andrew's reply might or might
not apply.
(To the list: it's possible JP did a 'merge -c 122' which created the
file and now is trying 'merge -c 123' to cherry-pick a followup commit
to that file.)