I have a question.
We use version press in slightly unusual way:
We don't have several environments like dev, stage etc. and we don't use clone site to clone from one env to another, instead we use version press only for auto-commit and whenever we want to even DB with git code we use apply changes option to create DB records per the code change.
Our issues: Merge conflict while trying to merge after the following scenario :
I found that version press uses custom driver to perform the merge which is located in wp-content/plugins/versionpress/src/Git/merge-drivers/ini-merge.sh.
There are 2 types of conflicts I have:
The conflict is in option_value row.
Can I add this file to .gitignore or I should always take bigger number? What is the right way to treat this conflict?
Does anybody knows what is the meaning of this number?
The conflicted change is in MYIP and in SOME_CODE what should I do with these?
Any help is really appreciated.
define('VP_GIT_BINARY', 'D:\Program Files\Git\bin\git.exe');
include_once __DIR__ . '/wp-config.common.php';
.git'as it was under repo before.