Replying to nobody

I would mirror damus main to my main.

I would have my changes in a branch off my main.

When damus pushes changes, I'd sync my main

Then I'd rebase my changes branch onto my main

No new commits should be required, until you add changes, or something conflicts.
Avatar
yunginter.net 2y ago

that makes sense.

looking at some graphics of the difference between merge vs rebase. I think I want to merge not rebase because I want to be able to look at 0.1 sideus and have the state of 1.5.4 (an older version of damus) to be linked to that set of commits. And not the new features branch be always ahead of the main? But I should be able to do this on one sideus-branch moving forward.

Reply to this note

Please Login to reply.

Discussion

72
nobody 2y ago

You can use separate branches for those sets of changes and fork them off the specific commit you want them pinned to, then use the rebase for a head, yes.

Avatar
yunginter.net 2y ago

ok then I link to the SHA “browse this repo at this point in the history” and people if they want, can use that link to compile their own .ipa

I think I get it now, thank you!