Process for coding changes common to both to SFX-2 & SFX-8...

[Mike Allen]

For background to this topic, view the comments regarding this commit on GitHub...

I'll start it off with a rhetorical question: what's the best way to make changes that are common to the SFX-2 and master (SFX-8) branches?

Personally, it seems best to:

1. Fork the repository into a private repo.
2. Clone the private repo onto your development machine and switch to the SFX-2 branch.
3. Make changes and commit.
4. Switch to the master (SFX-8) branch and merge the changes from the SFX-2 branch.
5. Resolve conflicts and commit.
6. Push changes back to your private repo.
7. Create a push request for the changes made on the SFX-2 branch to the main scalafx/scalafx GitHub repo, which should be merged with the SFX-2 branch.
8. Create a push request for the changes made on the master branch to the main scalafx/scalafx GitHub repo, which should be merged with the master branch.

However, is it possible/desirable to perform 7 & 8 as a single push request?

[Jarek Sacha]

From repo maintenance point of view it is better to have smaller commits and pull request (PR) focused on resolving a specific issue or new feature. Large PR may have small problematic parts that may prevent accepting a merge. So 7 and 8 PR should be submitted separately. Practically, from committer point of view, it is important to create feature branches, you can keep working on the next thing when previous feature branch is waiting for PR merge.

Other consideration Mike did not mention is if we should primarily work on `master` SFX8 branch, then backport what is common to SFX2. That would possibly simplify SFX8 development but complicate significantly support for SFX2.

I think the approach that Mike is proposing keeps both branches alive and we should use it since we still actively support both 7 & 8.

Jarek