Git good practices to keep a forked project up-to-date with its source origin when both are evolving
问题 Context I'm the main author of Next Right Now which is an open source "boilerplate" containing several "presets" of building a web app using the Next.js framework. Each preset comes with built-in features and is meant to be forked so other can build their app based on it. Each preset lives in its own git branch, such as: https://github.com/UnlyEd/next-right-now/tree/v2-mst-aptd-at-lcz-sty https://github.com/UnlyEd/next-right-now/tree/v2-mst-aptd-gcms-lcz-sty I'm working on NRN and making it