trouble switching/merging branches in git integration

7 次查看（过去 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 的更多信息

标签

产品


版本

R2020b

Community Treasure Hunt

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

Start Hunting!

Translated by