From eebeec06325da02672ead5946dc8e8a182afb0c0 Mon Sep 17 00:00:00 2001 From: Preetham S M Date: Thu, 12 Mar 2026 12:23:25 +0530 Subject: [PATCH 1/8] added file --- demo.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 demo.txt diff --git a/demo.txt b/demo.txt new file mode 100644 index 0000000..8e27be7 --- /dev/null +++ b/demo.txt @@ -0,0 +1 @@ +text From 388b34365cd90e1164e4384ab999220da05b9bd3 Mon Sep 17 00:00:00 2001 From: Preetham S M Date: Thu, 12 Mar 2026 12:27:09 +0530 Subject: [PATCH 2/8] branch1 edit --- conflict.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflict.txt diff --git a/conflict.txt b/conflict.txt new file mode 100644 index 0000000..1193ff4 --- /dev/null +++ b/conflict.txt @@ -0,0 +1 @@ +branch1 From 13a9279768d6e508669dc3d707f5e3a64c4ac828 Mon Sep 17 00:00:00 2001 From: Preetham S M Date: Thu, 12 Mar 2026 12:28:30 +0530 Subject: [PATCH 3/8] branch2 edit --- conflict.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflict.txt diff --git a/conflict.txt b/conflict.txt new file mode 100644 index 0000000..34d1da7 --- /dev/null +++ b/conflict.txt @@ -0,0 +1 @@ +branch2 From 2e667dabbffdc944bde85d5fbb8759d5f0c766b1 Mon Sep 17 00:00:00 2001 From: Preetham S M Date: Thu, 12 Mar 2026 12:50:10 +0530 Subject: [PATCH 4/8] Initial commit in master --- college.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 college.txt diff --git a/college.txt b/college.txt new file mode 100644 index 0000000..19bb7b9 --- /dev/null +++ b/college.txt @@ -0,0 +1 @@ +vvce college of engineering From 66a1a8b10dae1a5d560ccc1edfa9482a1c6985b8 Mon Sep 17 00:00:00 2001 From: Preetham S M Date: Thu, 12 Mar 2026 12:51:02 +0530 Subject: [PATCH 5/8] Updated content in lower_case branch --- college.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/college.txt b/college.txt index 19bb7b9..6aab21d 100644 --- a/college.txt +++ b/college.txt @@ -1 +1 @@ -vvce college of engineering +vvce college of engineering and technology From 4c02f4bdd863577878e83a59370b65c31fe34d32 Mon Sep 17 00:00:00 2001 From: Preetham S M Date: Thu, 12 Mar 2026 13:04:37 +0530 Subject: [PATCH 6/8] Initial commit in master --- college.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 college.txt diff --git a/college.txt b/college.txt new file mode 100644 index 0000000..19bb7b9 --- /dev/null +++ b/college.txt @@ -0,0 +1 @@ +vvce college of engineering From b89df459a6546faf7d3294da7641c9d094c24164 Mon Sep 17 00:00:00 2001 From: Preetham S M Date: Thu, 12 Mar 2026 13:05:27 +0530 Subject: [PATCH 7/8] Updated content in lower_case branch --- college.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/college.txt b/college.txt index 19bb7b9..6ce4900 100644 --- a/college.txt +++ b/college.txt @@ -1 +1 @@ -vvce college of engineering +vvce college of engineering mysuru From 5057a972d5e6b126bcd6c7178949926b33fbcf6e Mon Sep 17 00:00:00 2001 From: Preetham S M Date: Thu, 12 Mar 2026 13:06:20 +0530 Subject: [PATCH 8/8] Updated content in master branch --- college.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/college.txt b/college.txt index 6ce4900..7f16c76 100644 --- a/college.txt +++ b/college.txt @@ -1 +1 @@ -vvce college of engineering mysuru +vvce college of engineering karnataka