I'd like to propose a import strategy again, that allows future updates via `git merge` or `git subtree pull`, basically what I did for scintilla4 (see #2600). What do you think?
I proposed it in the previous PR already, here are the advantages again: - Files where we don't make changes always merge fine (for dirs we don't use). - Our changes and upstream changes are merged by git's methods - deletions/renamings can cause tree conflicts which are messy to deal with See #2600 for a proof-of-concept, it really works well if you ask me. Upstream releases are imported in a side branch (without any changes, plain, unmodified upstream) and we merge that into geany's master. Our modifications to the project are done directly on geany's master and will be preserved due to git's merging. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/2666#issuecomment-731641252
