Difference between git Pull and git Merge?

[joebordes]

To many changes there. I am missing something. Please explain the steps you take to migrate. The procedure is like this:

http://corebos.org/documentation/doku.php?id=en:upgradevt2cb

- make a copy (dump) of your database
- git clone
- copy storage, test, user_privilges, config.inc.php
- edit config.inc: change database access and root_directory
- login, go to coreBOS updater, load and apply all

that should be it

contact me and give me access to your server, I will hand hold you through the process and teach you what you need to know
once it is setup it is really easy to keep up to date