Branching/Rebasing strategy for forks (w/ some changesets not intended for PR)

[dcunited001]

I'm trying to manage a few changesets for myself that I don't intend to PR, but these personal patches need separate git refs. if there's small merge conflicts, i don't care. there's an example below the image. kinda theoretical... anyway

• there's the actual ref i'll be running, probably a descendant of dcunited001/master
• this should just continually rebase my personal changes on top of origin/master after the set of dcunited001/pullreq-n's that i have. if it's not my PR, i don't imagine that I'd be persisting it on my machine.
• usually for small tweaks, i would prefer changes outside of $XDG_DATA_HOME/omarchy

as far as branch rebasing (much of this is advanced and TMI)

• i don't manage regenerating new branches for rebases/merges that are difficult to fix within git
• i don't want to use graphite.dev, as it's github-specific. maybe idk, but i hate the idea of "hey here's API permissions for just everything i ever have on GH`
• i think it's overkill to set up git-stack but i've done that once before.
• if i did locally test PRs, then i would set up git-stack
• but it seems that for me to do lot of local testing (esp. if migrations are involved)... then that's kinda "picking the wrong target" for testing.
• i should maybe test those within a pool of VM snapshots and I don't really have the VM chops or bandwidth to do that.
• I'm pretty sure there's some other infrastructure used for testing PRs, but given that you need to manage to not break users' installs, it's more complicated than usual

only patching the path search order here. originally I thought this was used more often throughout omarchy, but it's not. I don't even have Guix Home set up at the moment, but I could imagine this being Nix Home Manager (standalone), but i'm not using home manager on my other Nixos machine.

Regardless of the details, this is theoretically the kind of patch that I'd want to survive rebases, but if I'm only making branches for PRs then i may still want multiple PRs active & rebased at the same time

diff --git a/bin/omarchy-launch-browser b/bin/omarchy-launch-browser
index a262f671..3be9af8a 100755
--- a/bin/omarchy-launch-browser
+++ b/bin/omarchy-launch-browser
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 default_browser=$(xdg-settings get default-web-browser)
-browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)
+browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.guix-home,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)
 
 if [[ $browser_exec =~ (firefox|zen|librewolf|mullvad) ]]; then
   private_flag="--private-window"
diff --git a/bin/omarchy-launch-webapp b/bin/omarchy-launch-webapp
index 09a6fc30..dcdc0254 100755
--- a/bin/omarchy-launch-webapp
+++ b/bin/omarchy-launch-webapp
@@ -7,4 +7,4 @@ google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium*)
 *) browser="chromium.desktop" ;;
 esac
 
-exec setsid uwsm-app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$1" "${@:2}"
+exec setsid uwsm-app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.guix-home,~/.nix-profile,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$1" "${@:2}"

[dcunited001]

The .git/config there is probably wrong. i was using local branches only and it was rebasing fine.

i haven't interacted with developers in a long time and i haven't really worked socially on many projects. i can get some fairly advanced stuff in to work in git, but it's just rarely been with multiple remotes. so idk how to express what I'm aiming for in terms of git config or git's technical concepts.

i tried asking gemini and it just confabulated a bunch of garbage that i could tell was very wrong

[dcunited001]

What I decided on:

• i'll just maintain a current branch on my remote
• I'll keep dcunited001/master in sync with origin/master

for any branches that i have, depending on the order in which they need to be applied:

branches=(icons guixhome)
base=master
theirs=origin
ours=dcunited001

# or origin/dev. this checks out a detached HEAD
git checkout $theirs/$base # redundant, IIRC. 

# depends, but you need to be on detached HEAD for the loop to work. 
# the rebase will crash unless the changesets are partitioned (entirely separate)

# git rebase --onto $target $fromRef $toRef
for topic in ${branches[@]}; do
  git rebase --onto HEAD $theirs/$base $ours/$topic
done

Still on detached head. Need to cycle out the branch ref. this is a bit messy

git branch -D current
git checkout -b current

then force-push (or not). obviously, my fork, but current is not a ref anyone should be depending on.

git push -F current dcunited001/current

It's not ideal, but updating each of topic refs should be much simpler

[dcunited001]

i also have

[pull]
	rebase = true
[rerere]
	enabled = true

# forgot to test this one...
# [rebase]
# 	autostash = true