Welcome to Software Development on Codidact!

Will you help us build our independent community of developers helping developers? We're small and trying to grow. We welcome questions about all aspects of software development, from design to code to QA and more. Got questions? Got answers? Got code you'd like someone to review? Please join us.

Review Suggested Edit

You can't approve or reject suggested edits because you haven't yet earned the Edit Posts ability.

For another perspective, I use TortoiseGit (https://tortoisegit.org/) on Windows a fair bit:
1. Checkout the branch.
2. Open the log window (Git Show log).
3. Right-click on the commit/branch that you want to reset to, and choose Reset...:
![A view of a Log Messages TortoiseGit window with master checked out, and a context menu shown on an earlier/lower commit, with the Reset menu item highighted.](https://software.codidact.com/uploads/7fgvpzdtvo58zluqfspwynqh11uc)
4. In that dialog, you can choose soft, hard, or mixed reset. I usually pick hard.
~~![An example TortoiseGit Reset dialog, with Reset Type set to Mixed.](https://software.codidact.com/uploads/6nbuz3o8fdumpcl2qqxiiygwezis)~~
5. Once done, like lizuki said, pushing may be troublesome, but if no one else has pushed that branch in the meantime, I like to push with the "force with lease" option checked. With it checked, you can only push if there are no new (as in, from other people) commits on the branch on the remote. But if you need to force it, just coordinate with others working off that branch.
~~![An example TortoiseGit Push dialog, with the "force with lease" option selected and highlighted.](https://software.codidact.com/uploads/pmsnzfn6d9h6h5ex11tdgzl2oevh)~~

For another perspective, I use TortoiseGit (https://tortoisegit.org/) on Windows a fair bit:
1. Checkout the branch.
2. Open the log window (Git Show log).
3. Right-click on the commit/branch that you want to reset to, and choose Reset...:
![A view of a Log Messages TortoiseGit window with master checked out, and a context menu shown on an earlier/lower commit, with the Reset menu item highighted.](https://software.codidact.com/uploads/7fgvpzdtvo58zluqfspwynqh11uc)
4. In that dialog, you can choose soft, hard, or mixed reset. I usually pick hard.
![An example TortoiseGit Reset dialog, with Reset Type set to Mixed.](https://software.codidact.com/uploads/6nbuz3o8fdumpcl2qqxiiygwezis)
5. Once done, pushing may be troublesome like lizuki said, but if no one else has pushed that branch in the meantime, I like to push with the "force with lease" option checked. With it checked, you can only push if there are no new (as in, from other people) commits on the branch on the remote. But if you need to force it, just coordinate with others working off that branch.
![An example TortoiseGit Push dialog, with the "force with lease" option selected and highlighted.](https://software.codidact.com/uploads/pmsnzfn6d9h6h5ex11tdgzl2oevh)

Communities

Review Suggested Edit