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.
Post History
I handle this with: Create a new branch with same commits Delete commits from main branch In the situation shown, if you do git checkout -b new_branch it will create a new branch with the sa...
Answer
#1: Initial revision
by
matthewsnyderâ€
·
2024-09-01T17:54:40Z (about 2 months ago)
I handle this with: 1. Create a new branch with same commits 2. Delete commits from main branch In the situation shown, if you do `git checkout -b new_branch` it will create a new branch with the same commits. You then switch back to `main` and get rid of the commits on it with `git reset HEAD~2`. You can use `ZZZ` instead of `HEAD~2` as the argument to reset if you don't want to count them. I think `origin/main` might also work. You can pass `--hard` so that it doesn't leave uncommitted files for you to clean up. This is also known as "I forgot to switch to a feature branch before making my commits".