diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..6d9e2cb --- /dev/null +++ b/test.txt @@ -0,0 +1,4 @@ + +create test.txt on origin dev branch› +create test.txt on clone dev branch› +two push confict fixed between origin and clone