$ git checkout -b new_branch_to_merge_later$echo"totally different content to merge later" > merge.txt$ git commit -am"edited the content of merge.txt to cause a conflict"
[new_branch_to_merge_later 6282319] edited the content of merge.txt to cause a conflict
1 file changed, 1 insertion(+), 1 deletion(-)
$ git status
On branch main
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge--abort" to abort the merge)
(use"git add <file>..."to mark resolution)
both modified: merge.txt