Create file1

SnehasDevOps · web-flow · commit 8869ee0ec018 · 2025-01-29T16:34:30.000+05:30
diff --git a/file1 b/file1
@@ -0,0 +1 @@
+we are testing merge conflict of local repo and central repo!

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+we are testing merge conflict of local repo and central repo!`