trouble switching/merging branches in git integration

1 visualizzazione (ultimi 30 giorni)
Roy Goodman
Roy Goodman il 11 Mar 2021
Risposto: Erlend il 14 Lug 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

Accedi per rispondere a questa domanda.

Risposte (1)

Erlend
Erlend il 14 Lug 2022
Where you able to fix it?

Categorie

Scopri di più su Source Control Integration in Help Center e File Exchange

Tag

Prodotti


Release

R2020b

Community Treasure Hunt

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

Start Hunting!

Translated by