I have successfully built a custom AOSP ROM on Google Cloud VM engine and my local machine. While I’m familiar with the process of building AOSP ROMs, I need advice on the best practices for tracking changes and handling updates. Specifically:

Repository Management: Should I create a GitHub repository and push the code with each update? What are the best practices for managing branches and commits in this scenario?
Integrating and Merging New Android Versions: How should I manage and integrate new Android version releases into my custom ROM? What is the best approach for merging upstream changes from AOSP into my custom ROM?
Handling Conflicts and Compatibility: What strategies can I use to deal with conflicts that arise from changes in new Android versions? How can I ensure compatibility of custom features and modifications when updating to new Android versions?
I would appreciate any insights, tips, or resources from those who have experience in maintaining and updating custom AOSP ROMs.