Versions Compared

Key

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

...

Stage and commit the changes on the main branch. You should notice that git no longer appends MERGING to the branch name.

Here is a visual view of the branches

...