Moving Tripal 4 back into tripal/tripal repo

[laceysanderson]

This has been started! 🎉

I have copied tripal/t4d8:9.x-4.x to tripal/tripal:4.x using the following process:

git clone https://github.com/tripal/tripal.git
cd tripal
git remote add t4d8 https://github.com/tripal/t4d8.git
git remote -v
     origin     https://github.com/tripal/tripal.git (fetch)
     origin     https://github.com/tripal/tripal.git (push)
     t4d8       https://github.com/tripal/t4d8.git (fetch)
     t4d8       https://github.com/tripal/t4d8.git (push)
git fetch t4d8
git checkout -b 4.x t4d8/9.x-4.x
     Branch '4.x' set up to track remote branch '9.x-4.x' from 't4d8'.
     Switched to a new branch '4.x'
git push origin 4.x

Updating tripal/tripal:4.x to match tripal/t4d8:9.x-4.x

We will want to periodically update tripal/tripal:4.x to match tripal/t4d8:9.x-4.x throughout the month until the alpha1 release. This can be done as follows:

git clone https://github.com/tripal/tripal.git
cd tripal
git checkout 4.x
git remote add t4d8 https://github.com/tripal/t4d8.git
git merge t4d8/9.x-4.x

[laceysanderson]

Updated the 4.x branch in tripal/tripal up to f3d32bfbb8142facaa68e1991812661f7a64d68c as of today. We will make the release at tripal/tripal, not here!

[spficklin]

wow