After a wrong merge all the code-changes of the last day were overwritten. Because it was not noticed, new commits were made on top of the wrong merge. How can I go back to a certain commit and then add the commits that had been made after the wrong merge?
git reset or git revert ?