Merge Conflicts
git switch -C bugfix/change-password
code change-password.txt
make changes
git add .
git commit -m "Updated change password.txt"
git switch master
code change-password.txt
make changes
git add .
git commit -m "Updated change password.txt"
git merge bugfix/change-password
git status
code change-password.txt
resolve conflicts
git add change-password.txt
git commit