Merging non-git code with git based code (initial code base is the same)?

Making another branch and then submitting his changes would be a good way to do it.

Branching is the normal approach in Git. That means: branch from your current code, do the merge there and when succesful, merge it back into the main branch.

I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.