Re:Git cherry-pick and revert use 3-way merge
by andirk on Friday November 10, 2023 @02:56PM
(#38223698)
"With great power comes great responsibility"
That's version control. You have every choice from straight forward to mind-blowingly time-manipulatingly complex. If you fear the unknown, then just do the out of the box stuff via a GUI like Sourcetree. If you're willing to sweat, then use Sourcetree but sometimes `git rebase HEAD~3` and rewrite history.
And there's no shame in adding a `Fix: Change var to int` to be written into the annals of history forever. Don't worry about it.
That's version control. You have every choice from straight forward to mind-blowingly time-manipulatingly complex. If you fear the unknown, then just do the out of the box stuff via a GUI like Sourcetree. If you're willing to sweat, then use Sourcetree but sometimes `git rebase HEAD~3` and rewrite history.
And there's no shame in adding a `Fix: Change var to int` to be written into the annals of history forever. Don't worry about it.