LimeSurvey/LimeSurvey — comment on commit f495f51389775abb690e3c90c58f968e08ee537d
File:  line 0
By TMSWhite:

I don't recommend trying to test git merge yet. Dev may not be a true branch of master, as far as Git is aware, since it started as dev, then went to dev_tms, then to _ci, then back to _dev; and somewhere in there was overlayed with content from master.

So, if we tried a git merge at this point, there is a very large risk that it would totally mess up master, dev, or both.

I think we'll need to very carefully merge dev back into master when we release 1.92 stable. After we have master at 1.92 release, then we could re-branch dev from it, and take advantage of Git merge functions from that point on.

-Tom