trouble switching/merging branches in git integration

조회 수: 1 (최근 30일)
Roy Goodman
Roy Goodman 2021년 3월 11일
답변: Erlend 2022년 7월 14일
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

이 질문에 답변하려면 로그인하십시오.

답변 (1개)

Erlend
Erlend 2022년 7월 14일
Where you able to fix it?

카테고리

Help Center 및 File Exchange에서 Source Control Integration에 대해 자세히 알아보기

태그

제품


릴리스

R2020b

Community Treasure Hunt

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

Start Hunting!

Translated by