Child pages
  • What's new in MPS 2018.3 (draft)

Versions Compared

Key

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

...

Now after applying changes from one side of the conflict the other conflicting changes are converted to the addition into the end of the changed group and it is possible necessary to apply or ignore them separately.

For example:

Image RemovedImage Added
After applying left version of the conflict you still can apply or ignore the line from the right side:

Image RemovedImage Added

Fixed and improved actions for working with deprecated code

...