Difference between git Pull and git Merge?

[mweaver]

Now that I've had a little more coffee and re-read the information I realized there was a step I was missing which cause things to get messed up. I'm setting up for a another pass at it and will be following these steps:

- make a copy (dump) of your database (already exists on the DB server)

- git clone https://github.com/tsolucio/corebos
- copy storage, test, user_privilges, config.inc.php
- edit config.inc: change database access and root_directory
- copy build/HelperScripts/installupdater.php to the root of your install and execute it
- http://my_server/apps/cbtest/installupdater.php
- login, go to coreBOS updater, load and apply all

Even though I've screwed up about 10 passes at this in the last week and experienced a years worth of frustration - due to my being in a hurry and missing things - I am leaning a lot and re-learning things I'd forgotten. Thank you Joe for your seemingly inexhaustible supply of patience.

almost there...