Versions Compared

Old Version 12

changes.mady.by.user Maria Haider

Saved on

compared with

New Version 13

changes.mady.by.user Maria Haider

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Code Block
git checkout stable-2023v1
git pull
git checkout sa-beta
git diff HEAD..stable-2023v1 (checked the diffs)
git merge stable-2023v1
git status (check if there are conflicts)
git diff stable-2023v1:<fil><file> HEAD:<fil><file> (to check file with conflicts) 
fix conflicts locally or run git merge stable-2023v1 -X theirs (to replace the conflicted files with those from stable-2023v1)
bump-tag

...