Add AstroPaper as a remote repository
git remote add ap https://github.com/satnaing/astro-paper
git merge ap/main --allow-unrelated-histories
Resolve conflicts manually
I use VS Code so it’s a painful process to look at code line by line.
Commit and push changes
git commit -m 'Merge from astropaper'
git push