trouble switching/merging branches in git integration

5 ビュー (過去 30 日間)
Roy Goodman
Roy Goodman 2021 年 3 月 11 日
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?

回答 (0 件)





Community Treasure Hunt

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

Start Hunting!

Translated by