Relative Content

Tag Archive for gitvisual-studio-codegit-submodulesmerge-conflict-resolution

Cant Resolve Merge Conflicts in VSCode in a Submodule

Problem If a Merge Conflict occurs in a Submodule in VSCode the Merge editor opens and i can resolve the conflict, after that i can commit those changes. But after that i cant click on continue or something else i have to go to the directory and execute git rebase –continue after that all seems […]