Since I've never done this before, can someone confirm that all we have to do is
git checkout master git merge 2.3-staging ? I did this locally and I think it went pretty well. There were three conflicts, none of which seems complicated to resolve. Richard since you did the commands for the branching, please feel free to go ahead with the merging if you feel more confident than I. Scott
signature.asc
Description: PGP signature