Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- I had a team member commit some work on a level design tool to our main branch, when that work should have gone in its own levelDesign branch
- so I did git checkout main to go to the main branch.
- then I did git reset --keep HEAD~1 to reset the main branch
- then I did git checkout -b levelDesign to checkout to a new branch from that reset version
- and git cherry-pick ..HEAD@{2} to cherry pick the commits back onto the levelDesign branch using the reflog.
- then i set the upstream of the new leveldesign branch to origin/leveldesign and pushed it, and force pushed the master branch so the commit disappeared from that branch
- effectively just moving his commit to the new branch it should have been on (at least I hope lol)
- but now
- that same teammember has yet again committed to main
- how do I go about fixing this horror?
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement