I use Gitlab and Visual Code to do code versioning and I have the following problem:
When cloning a project directly from master and then doing git pull origin tv_version my files are giving as
"MERGE CONFLICT" and if I clone directly from my tv_version branch using git clone -b tv_version <local do git> , the
Visual Code gives "ESTAGED FILES" .
The idea of branchs:
master and tv_version they contain almost the same files, the only difference is that tv_version has changes that master does not own and should not have / p>
Questions:
