Tortoisegit. How to properly rollback a commit?

Question

git

I'm trying to learn how to work with commits (rollback of a specific commit).
Tried two options.
First option
1. I make 4 commits.

2. I move master to a commit below

3. I didn't see changes in the file locally until I did "Revert to this revision" on the file name

4. trying to commit changes to an external repository produces

------------- -------------------------------------------------- ----------
The second option!
1. TortoiseSVN > Show log
2. In the log window that opens, open an additional menu on the desired commit "Revert change by this commit"

3. Displays a conflict message

4. In the folder, right-click on the file name TortoiseSVN > "Edit conflicts"
5. The conflict window opens and select "Mark as resolved" and close the window
6. commit (all fields will be filled in by themselves)
7. push without problems
BUT where is the conflict from (
I ask for help from specialists .... on working with TortoiseGit .

Answer 1

Reset - Resets the branch pointer and/or index.
Revert - Creates a new commit containing the revert of the selected commit. I don't know what Tortoisegit developers mean by revert.
git push can only be done when the server is able to perform a fast-forward when committing the changes.
But you reset the branch, so fast-forward merge is not possible.
You can get around this with the key force "git push -f"
But if you are not working on the repository alone, then if you were your colleagues, I would kick you.
Until you read Pro Git (in Russian translation "Git for a professional programmer"), you will poke and poke around.

Answer 2

Larisa You need to check the "known changes" checkbox here for more details with screenshots