merge-conflict-resolution - 故意制造合并冲突

Question

我已经从 GitHub 中提取了文件。现在我需要创建一个合并冲突。

如何在 GitHub 上故意创建合并冲突？

Answer 1

在两个分支中编辑同一行，并尝试合并

Merge conflicts in git happen, when two branches were changed on the same line or in the same content of a file before a merge. If you just extend a file or append something, git usually just figures it out by itself.

使用此代码:

#!/bin/bash
mkdir git-repo
cd git-repo
git init
touch my_code.sh
git add my_code.sh
echo "echo Hello" > my_code.sh
git commit -am 'initial'
git checkout -b new_branch
echo "echo \"Hello World\"" > my_code.sh
git commit -am 'first commit on new_branch'
git checkout master
echo "echo \"Hello World!\"" > my_code.sh
git commit -am 'second commit on master'
git merge new_branch

脚本来自: https://jonathanmh.com/how-to-create-a-git-merge-conflict/
标题学分: Alexander O'Mara