My next question is how to pull new changes from remote while putting my new work on top. Linus' git does a decent job of that with pull, but my experience with git9 is rather less pleasant.
Looking at it, it seems like a work for git/rebase. Here I'm trying to take the work from fluxcpu% git/branch heads/some_feature fluxcpu% git/rebase remotes/origin/regen refs/heads/_rebase.working: 7664f5db108af0debf257470be6ac3126ee0206b pick 44574500459e507d51e6a359ebe6fd2a1c3df1da Save these files for later. diff: cannot open b/386/bin/ape//null: file does not exist: 'b/386/bin/ape//null' diff: cannot open b/386/bin/auth//null: file does not exist: 'b/386/bin/auth//null' diff: cannot open b/386/bin/aux//null: file does not exist: 'b/386/bin/aux//null' ... Rebase appears to be both expensive, and perhaps buggy? I'm not sure what's up with the very long scroll of the same error, applied to different files. This is also too slow to be usable, at least for a tree as large as NIX. We'll get NIX pruned down into small changes to bind over 9front, but I don't see how to update my working branch to track upstream. Any advice? On Sun, Jan 12, 2025 at 11:55 AM Paul Lalonde <paul.a.lalo...@gmail.com> wrote: > Now that I'm doing some daily development, I'm running into process issues > with git. That probably means I'm doing something wrong, and I'm hoping > someone might disabuse me. > > My workflow is to sync my github fork of rminnich/nixos, then git/pull to > get up to date with my repo. I then make a branch for my work: git/branch > -b remotes/origin/regen -n some_feature > After some time, I commit my changes and git/push. I can then generate > the pull request on github and manage the review there, etc, then delete > the branch on github, then 'git/branch regen && git/branch -d some_feature' > to clean up my world. > > This almost works, but leaves a bunch of remotes in my repo: > > fluxcpu% git/branch -a > heads/master > heads/fix_multiboot_magic > heads/keep > heads/_rebase.working > heads/fix_mp_init > heads/some_feature > remotes/origin/master > remotes/origin/regen > remotes/origin/boots > remotes/origin/multiboot_magic > remotes/origin/fix_multiboot_magic > remotes/origin/fix_mp_init > > > What's the right way to clean up these ever-growing remotes? > > Paul > ------------------------------------------ 9fans: 9fans Permalink: https://9fans.topicbox.com/groups/9fans/Tc30944502958e1a0-M0b73ad2941119c82f0570bb4 Delivery options: https://9fans.topicbox.com/groups/9fans/subscription
