Versions Compared

Old Version 31

changes.mady.by.user Christopher O'Grady

Saved on

compared with

New Version 32

changes.mady.by.user Christopher O'Grady

Saved on

Key

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

...

If the local commits and the commits from upstream will modify the same line in the same file, this will result in a merge conflict.

Info

NOTE: We are still not confident in the usage of "rebase" below. There was one instance where we (weninc/cpo) ended up losing files. Maybe safer to use "pull".

...