!QhvgabMQzwEQeWehhZ:lossy.network

NixOS Home Automation

515 Members
Declarative Home Automation and other Sidequests | https://wiki.nixos.org/wiki/Home_Assistant132 Servers

You have reached the beginning of time (for this room).


SenderMessageTime
30 Mar 2025
@k900:0upti.meK900The other is what I just described, often called the "stacked" workflow09:55:17
@k900:0upti.meK900 The built-in git tool for doing all of this would be git rebase 09:55:44
@k900:0upti.meK900But it's a pretty sharp tool that is easy to hold wrong09:55:59
@k900:0upti.meK900You might want to use something like https://git-ps.sh/09:57:07
@continous:matrix.orgcontinousWhat exactly is...rebasing? I know I'm taking up your time so don't feel pressured to answer right away.09:58:03
@k900:0upti.meK900Or maybe https://git-revise.readthedocs.io/en/latest/09:58:08
@continous:matrix.orgcontinousRevise git seems more like what I might want to do...09:58:30
@k900:0upti.meK900"Rebasing" is basically just taking your changes and applying them on top of a different commit09:58:44
@k900:0upti.meK900So you're moving them to a new base, so to say09:58:49
@k900:0upti.meK900 But git rebase actually does a lot more than just rebase 09:58:56
@k900:0upti.meK900It can also combine and edit commits09:59:25
@k900:0upti.meK900Though the UX for that is ... not very good09:59:40
@continous:matrix.orgcontinousI'll try git-ps10:00:38
@continous:matrix.orgcontinousAlso I just noticed I forgot to update the git and license stuff too lol10:01:00

Show newer messages


Back to Room ListRoom Version: 6