About

Conflicts

A conflict occurs when a file has been change remotely (in the Boomi repository) and / or locally in the file system.

Pull and Push command will recognize conflicts and behave as follows.

--- CODE.PUSH ---
Recognized 1 local changes.
Recognized 1 component(s) for pushing...

Conflict for 22d40bc9-a8e9-465c-975c-1d9430729b9c 'psg.PGP_Encrypt': 
  Local edited version is based on v7 and cannot be pushed 
  because remote (current) version has also been changed to v8
  
Saving 22d40bc9-a8e9-465c-975c-1d9430729b9c~7 to script\98 - Sandbox
Saving 22d40bc9-a8e9-465c-975c-1d9430729b9c~8 to script\98 - Sandbox

As the result you will have three local files:

  1. fileXY.groovy is the file your edited locally and that you want to push to Boomi.

  2. fileXY~7.groovy (the one with the lower version) is the origin of script that was edited locally.

  3. fileXY-8.groovy (the one with the high version number) is the just pulled and current script as it exists in Boomi.

Resolution

To discard your local changes delete the local fileXY.groocy and run a code pull to pull the latest version into your local Workspace. Optionally, you can specify /c <componentId> to pull only this particular component.

To overwrite the remote changes, run a code push /force /c <componentId>. Specifying the component Id is very much recommended. Otherwise all your local changes are forced into Boomi.

Last updated