abruptly8951@lemmy.worldtoFediverse@lemmy.world•Fediverse software fork managementEnglish
4·
1 year agoYou need rebase instead. Merge just creates useless commits and makes the diffs harder to comprehend (all changes are shown at once, but with rebase you fix the conflicts in the commit where they happened)
Then instead of your branch of branch strat you just rebase daily into main and you’re golden when it comes time to PR
Something makes me uneasy about this being a Google sheet, you need to use credentials to view it and someone has a log of who has accessed it…you can probably even see who’s viewing it in realtime
Use an anonymous account! Or someone should host this on a website or something with higher privacy