trouble switching/merging branches in git integration

1 Ansicht (letzte 30 Tage)
Roy Goodman
Roy Goodman am 11 Mär. 2021
Beantwortet: Erlend am 14 Jul. 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

Melden Sie sich an, um diese Frage zu beantworten.

Antworten (1)

Erlend
Erlend am 14 Jul. 2022
Where you able to fix it?

Kategorien

Mehr zu Source Control finden Sie in Help Center und File Exchange

Tags

Produkte


Version

R2020b

Community Treasure Hunt

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

Start Hunting!

Translated by