Bug fix commit 28

Author: JavaScriptonit

bugfix1/bugfix1_28.txt

@@ -0,0 +1 @@
+Bug fix commit 28

line_merge_rebase_demo.sh

@@ -4,7 +4,7 @@
 echo "Creating bugfix/1 branch..."
 git checkout -b bugfix/1
 git checkout bugfix/1
-for i in {26..27}; do
+for i in {28..29}; do
  cd /Users/andreyshabunov/PhpstormProjects/git-practics/bugfix1/
  echo "Bug fix commit $i" > bugfix1_$i.txt
  cd /Users/andreyshabunov/PhpstormProjects/git-practics/
@@ -26,7 +26,7 @@ git rebase main
 # Возвращаемся к main и выполняем merge bugfix/1
 echo "Merging bugfix/1 into main using git merge..."
 git checkout main
-git merge bugfix/1 -m "Merge bugfix/1 into main"
+git merge --no-ff bugfix/1 -m "Merge bugfix/1 into main"
 git push -u origin main
 
 # Итоговое состояние репозитория