Versions Compared

Old Version 3

changes.mady.by.user Fabiola Arias Navia

Saved on

compared with

New Version 4

changes.mady.by.user Fabiola Arias Navia

Saved on

Key

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

...

The time comes to produce the next release so the new features are merged back to the Main Trunk adding "Rice" to the file and resulting in "Milk Eggs Soup Bread Rice". This is a semi-automated step. The system can make most changes accurately but where the same line has changed it will report conflicts and require that the conflict is resolved before the change can be committed into the VCS to create revision 8. This happens here because line 4 has been changed in both the Main Trunk and Branch. In this case the developer decided that both changes needed to stay with the new feature change added after the Main Trunk change.

Also See

Working with Tasks in the LANSA for i User Guide