- Run
git log --all --oneline --decorate --graphto get a feel for the repository's structure - Merge the changes from the
circumferencebranch intomain; resolve the merge conflict as follows:- Keep the more precise value for
PI - Keep both functions
- Keep the more precise value for
- Push the changes you've made to your fork on GitHub
- Submit a pull request to the original project owner