trouble switching/merging branches in git integration

1 vue (au cours des 30 derniers jours)
Roy Goodman
Roy Goodman le 11 Mar 2021
Réponse apportée : Erlend le 14 Juil 2022
I am using the git integration in a MATLAB Project and am running into an error.
I need merge a branch back into the master branch. Right now I'm in a branch called "Development." I think that I need to
  1. Switch back to "master"
  2. Merge "Development" into "master"
From the Branches menu, I selected "master" and then clicked "switch." I get this error message:
Git internal error (Code = -13, Class = 20): 1 conflict prevents checkout
Now what?
Thanks

Connectez-vous pour répondre à cette question.

Réponses (1)

Erlend
Erlend le 14 Juil 2022
Where you able to fix it?

Catégories

En savoir plus sur Source Control Integration dans Help Center et File Exchange

Tags

Produits


Version

R2020b

Community Treasure Hunt

Find the treasures in MATLAB Central and discover how the community can help you!

Start Hunting!

Translated by