Personal I have the following problem, I was developing and slowly comminuting the changes, when I arrived at a certain point I had to go back in one of the commits using:
git reset --hard <numero do commit>
I saw that after it a feature stopped working.
But I ended up leaving in this commit that I came back and implemented more things. When I went to make push , he obviously fell for it. You asked me to do pull , but I do not want to give pull of the commits after that, I just want to upload the commit that I came back with the new implementations I made on top of it.
Does anyone know how to wrap this without losing the data I've implemented in the old commit? I want to be able to discard the commits that are ahead of him, and just consider this commit with the new things I last commited.