title: How to go back to an old commit and merge with top of the branch?
body: <p>I just realized and the top of our working branch is missing a vital commit I made. Most probably someone in my team wrote over this commit, his changes..</p>
  
  <p>How can I go back to that commit and then re merge with the top of the branch?</p>
  
  <p>I tried creating a branch with only my commit and then merging with the top of the main branch but git does an auto merge and just stacks all the changes that happened after my commit over this diverged branch that I created.</p>
  
  <p>Thanks.</p>