Subnostr

git experts, I have a dumb noob question:

So with sideus I’ve been making branches for each build (I want to link to each one separately). I tried to make one branch and commit these multiple changes sequentially too it, I guess I would link to the commits, but I would have to cherry pick an older master to not run into merge issues. Since it’s evolving with the master and not a full fork, are the multiple branches ok or should I be doing something different, like try to make one branch with commits moving forward?

Reply to this note

Please Login to reply.

Discussion

nobody 2y ago

Wouldn't it be easier to have one branch and just rebase onto the source?

yunginter.net 2y ago

new term for me

so I have a changes-branch with only my changes in the correct folders, everything else is gone.

Then I have a main branch as the master-sideus branch.

When damus updates, I sync fork on master-sideus branch…

then I recommit the changes to from my changes branch?

nobody 2y ago

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.

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.

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.

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!