release v3.10.0

[kieckhafer]

v3.10.0

This release is coordinated with the release of Reaction v3.10.0, Reaction Admin v3.0.0-beta.10, Reaction Identity v3.3.0 and Example Storefront v4.0.0 to keep the reaction-development-platform up-to-date with the latest version of all our development platform projects.

[ghost]

I understand the way to use the Makefile update checkouts but is there a prescribed way to keep the RDP updated when merging in changes from upstream? Last time I updated git presented 3 merge options (fast-forward, merge, rebase) and it wasn't clear which would be the best for the use case in which no dev platform updates were made outside the subprojects.

EDIT: In my case I hit some issues trying to simply pull with a merge (since it appears merges are being used) and then I decided to hard reset to the commit from the upstream after things got a little messy in my RDP commit history. Having a prescribed method for merging in upstream changes will help prevent issues like those I had where 3 choices are presented and can, as a result, lead to variance in the downstream projects depending on which path they take (merge, ff, rebase).

[kieckhafer]

Hey @balibebas, if you're talking about what I think you are, I think you ran into something that git recently implemented, nothing specifically due to Reaction code. With the latest version of git, they no longer set a default reconciliation option for you, they ask you to choose which you'd like to be your default. It would be a screen something like this:

warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
  git config pull.rebase false  # merge (the default strategy)
  git config pull.rebase true   # rebase
  git config pull.ff only       # fast-forward only
You can replace "git config" with "git config --global" to set a default
preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.

This is for ALL your projects, not just Reaction. In the past, git automatically set git config pull.rebase false as the default option, so if you were happy with how things worked prior to that update, then you should choose git config pull.rebase false as your default.

[ghost]

Okay, great. That's a fantastic answer. And a great new feature in Git. I like the idea of failing loudly for devtools so I think I'll set this one at the project level for --ff-only to ensure I'm always upgrading RDP to the exact version released. Then, for the apps, rebasing is the Holy Grail in my opinion.