trouble switching/merging branches in git integration

6 ビュー (過去 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 で Function Creation についてさらに検索

タグ

製品


リリース

R2020b

Community Treasure Hunt

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

Start Hunting!

Translated by