how can two developers operate code on a remote branch at the same time
how can two developers operate code on a remote branch at the same time
first, then merge.
if you can communicate in advance, it is better to communicate, one as a reviewer first merges (and is responsible for resolving conflicts) the code of another person, and then submits it to the remote branch.
if people in the post-push cannot communicate due to various subtle reasons, they need to first Synchronize the remote code, resolve the conflict, and then submit it to the remote end. Either merge or rebase is fine here. See the team and recommend rebase.
deal with it in a collaborative manner
vscode automatically generates a .vscode folder during debugging. I delete it with git rm .vscode , prompting fatal: pathspec .vscode did not match any files , not even with quotation marks. How can I delete this folder? ...