Versions Compared

Old Version 2

changes.mady.by.user Unknown User (gbg)

Saved on

compared with

New Version Current

changes.mady.by.user Unknown User (gbg)

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Changed 'git checkout develop' to 'git checkout master'

...

Once you're done, squash all those changes into a single commit on the develop branch, and delete the temporary branch:

git checkout developmaster
git merge --squash work
git commit -a

...