it might just be my lack of GitHub knowledge, but my current update workflow is: Pull my repo, fetch cal.com’s and merge it with mine, check over any merge conflicts, usually none but I find it keeps trying to add github workflows or stuff, when you make changes to it upstream is there a way to block certain folders or parts of the upstream from merging in to mine - or is there a better way to complete upgrades

in the project root open

.git/info/exclude

this is your local

.gitignore

Will try later thanks!