In git this would probably map to something like a HEAD that tracks many brances at once, and you'd pick the actual destination branch upon each commit.

Are there good ways to do this comfortably with plain git? (I.e., without having a megascript that just premerges everything to simulate the "multihead".)

Infosec.TownBlake Leonard (@blake)Here's where #jj starts getting quite powerful: this is a "merge commit" with its own contents (the Working Copy), merging from three other commits: the first Parent Commit is the tip of the xmpp-sdk branch¹; the second Parent Commit overrides dependencies just on my machine -- it's marked private so jj won't let me push it -- so that it'll use my local copy of moxxmpp so I can develop it too; the third Parent Commit is the "actual" commit I'm working on, and where I'll squash my changes from the Working Copy once I'm done with them (and figuring out what, exactly, I changed/fixed...). <small>¹ This specific commit is a small override to `StartTlsNegotiator` to say it's okay to skip it on localhost (for testing & development). [My last push](https://codeberg.org/spades/spades-flutter/compare/8e52329f3bacf1ff05b0cc7f3f93091ac32b102e...970c2e19c5e00d5816752993baccac1b5c3715c6) to this branch includes that commit.</small> #jjvcs #jj-vcs 📎

#git #vcs #programming

Frühere Suchanfragen

Suchoptionen

Verwaltet von:

Serverstatistik:

#vcs