Ah, fuck. I merged a branch that has changes that should have been into two separated commits squashed into one. I’m a failure 😭 - ThreadSky

About ThreadSky

rosactrl.bsky.social • 124 days ago

Ah, fuck. I merged a branch that has changes that should have been into two separated commits squashed into one. I’m a failure 😭

Comments

hyperfekt.net•124 days ago

no you're not. making mistakes is part of life. i make many mistakes and only few of them actually matter. all the rest i just try not to do again

lukehere.bsky.social•124 days ago

have u tried jj before?

rosactrl.bsky.social•124 days ago

I know about it, but I haven’t. How would have it helped in this case? I think I was sloppy and just forgot to check the commits one last time

lukehere.bsky.social•124 days ago

jj undo! i think that’s all u would have to undo it all. jj’s The operation log is great

rosactrl.bsky.social•124 days ago

Aha! That sounds useful, except I realised it after merging the remote, so I did fix it by rebasing again and force pushing to main 🙈

rosactrl.bsky.social•124 days ago

I think Pijul would have helped here though, because no merges, WIN WIN. But no hope to use it at work anytime soon ☹️

hyperfekt.net•124 days ago

i still want to use pijul for greenfield stuff and i don't understand why it still doesn't have a first class git mirror, making it a nonstarter for almost everything :/

hyperfekt.net•124 days ago

i think the best explanation is that it's not directly on the path of what the author desires, which is to build a better version control tool, not to improve version control for people

hyperfekt.net•124 days ago

seems like i am wrong, there's this, which is very cool to read. we may yet get our vcs dreams fulfilled
https://discourse.pijul.org/t/where-to-donate-to-help-fund-development/1199/7

rosactrl.bsky.social•124 days ago

Double fuck, I just learned about —rebase-merges

rosactrl.bsky.social•124 days ago

I just force pushed, I blame you, nobody stopped me

Posting Rules

Be respectful to others
No spam or self-promotion
Stay on topic
Follow Bluesky's terms of service

Comments

Posting Rules

Reply