mirror of
https://codeberg.org/comaps/comaps.git
synced 2026-04-21 07:29:43 +00:00
5
Cherry-picking
eisa01 edited this page 2026-02-15 14:35:12 +01:00
Use git cherry-pick (git rebase also works) to sync with the OM code
See our tracking issues under the OM label for list of changes that need to be processed
- Keep the authorship and sign-offs of the original commits
- Skip or remove all OM's binary files (e.g.
*.bin,*.mwmetc.) as they're covered by OM's proprietary binary data license - Add original commits SHAs (from OM's repo) to PR description in a
git log --onelineformat (example) - Label OM cherry-picking PRs with the
OMlabel - Keep cherry-picking history so that we know what had been picked already, what had been discarded, what needs to be considered for picking, etc. in issues like https://codeberg.org/comaps/comaps/issues/1373 (keep updated the first post there and add any picked commits and respective PRs as separate posts)
- Fix-ups (excluding merge conflict resolves) and adaptations (e.g. modifying icon to use CM colors) should be done in a separate commit of your authorship
- When preparing release notes mention the original author and that it came from OM (e.g.
Fixed ... - by @vng via OM)