trouble switching/merging branches in git integration

1 view (last 30 days)
Roy Goodman
Roy Goodman on 11 Mar 2021
Answered: Erlend on 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

Sign in to answer this question.

Answers (1)

Erlend
Erlend on 14 Jul 2022
Where you able to fix it?

Categories

Find more on Source Control Integration in Help Center and File Exchange

Tags

Products


Release

R2020b

Community Treasure Hunt

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

Start Hunting!