Manually merge files after rebase

Question

I\'m having my main project A from which I copied some files and set up a project A_Zero.

Meanwhile A_Zero is working well and I\'m