-
-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
わざとGit のコンフリクトを起こす例をどこかに置いておく #7
Comments
ここにリポジトリのリンクを配置 |
$ git clone https://github.com/terasakisatoshi/conflict_iyada.git
$ cd conflict_iyada
$ bash demo.sh
$ cd sandbox
$ git merge branchB # コンフリクト発生
$ code . # ここで VS Code を開く |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
コンフリクトの解消を VS Code で行う例を追記する
The text was updated successfully, but these errors were encountered: