title: How to submit my changes in abc file which is old version while git has same abc file with new changes by other developer?
body: <p>To be more clear, I was working on file abc which was in my remote repository for a long time and some other developer worked on same file made new changes and merged. I checkout to my old commit after a long time which has old version of abc file and start make changes and push it. </p>
  
  <p>When I compare my changes with base file (recent version of abc) some new changes are found and that new changes are required for our project. I do not want to replace their changes But how can I merge my changes with the latest version of abc file instead of replacing.    </p>