a rondu files lo yadhi kavalo adhi unchi migatadhi delete

1.txt

@@ -3,6 +3,10 @@ void main()
  1st file to learn
 
 1st dhi change cheste em  avutadhi
+
+mundhu inko branchlo 1.txt change chesam epudu ekkada chesi conflict em ayina vastadhi emo chudham
+
+
 while(1);
 
-}
+}

2.txt

@@ -1,6 +1,13 @@
 void main()
 {
 2nd file to learn
+
+2 lo yala change 
+
+malli branch create chesi edit chesa
+
+malli create chesina branch ki vachesam ekkada mundhu chesina change undadhu
+
 while(1);
 
-}
+}

file

@@ -0,0 +1 @@
+side-ki ki folder create 

foldersideki.txt

@@ -0,0 +1 @@
+last endo side-ki chestunte edhi vachindhi 

main.c.txt

@@ -3,4 +3,6 @@ void main()
 
 while(1);
 
-}
+problem fix chedham 
+
+}

side-ki

@@ -0,0 +1 @@
+last endo side-ki chestunte edhi vachindhi