| 30 Mar 2025 |
K900 | The other is what I just described, often called the "stacked" workflow | 09:55:17 |
K900 | The built-in git tool for doing all of this would be git rebase | 09:55:44 |
K900 | But it's a pretty sharp tool that is easy to hold wrong | 09:55:59 |
K900 | You might want to use something like https://git-ps.sh/ | 09:57:07 |
continous | What exactly is...rebasing? I know I'm taking up your time so don't feel pressured to answer right away. | 09:58:03 |
K900 | Or maybe https://git-revise.readthedocs.io/en/latest/ | 09:58:08 |
continous | Revise git seems more like what I might want to do... | 09:58:30 |
K900 | "Rebasing" is basically just taking your changes and applying them on top of a different commit | 09:58:44 |
K900 | So you're moving them to a new base, so to say | 09:58:49 |
K900 | But git rebase actually does a lot more than just rebase | 09:58:56 |
K900 | It can also combine and edit commits | 09:59:25 |
K900 | Though the UX for that is ... not very good | 09:59:40 |
continous | I'll try git-ps | 10:00:38 |
continous | Also I just noticed I forgot to update the git and license stuff too lol | 10:01:00 |