How to clone a direct project from a Branch?

Asked

Viewed 226 times

0

I use Gitlab and Visual Code to do code versioning and I have the following problem:

When cloning a project direct from master and then do the git pull origin tv_version my files are giving like "MERGE CONFLICT" and in case I clone straight from my branch tv_version using git clone -b tv_version <local do git>, the Visual Code gives as "INTERNS".

The idea of the branchs:

The master and the tv_version they contain virtually the same files, the only different is that the tv_version has changed that the master does not possess and must not possess.

Doubts:

  1. Why gives the famous merge conflict and how to solve it?
  2. What is "Interns Files", why it gives this and how to solve it?

inserir a descrição da imagem aqui

git versioning gitlab

  • I recommend: https://answall.com/q/320129/99718

  • What are you putting as <local do git> in charge?

No answers

Browser other questions tagged git versioning gitlab

You are not signed in. Login or sign up in order to post.