• InfoWorks WS Pro

Understanding version control systems

Differentiate between the lock and merge version control systems in InfoWorks WS Pro.


00:04

Before you start using info works.

00:05

WS pro it is important to understand how its version control systems work.

00:11

There are two methods for managing version controlled objects.

00:14

The lock method and the merge method,

00:17

the lock method is the legacy version control system better known as check in.

00:22

Check out

00:24

in this version control system objects are locked for editing

00:27

until you check them out before working on them.

00:30

Using the lock method.

00:32

The objects that are version controlled include geo explorers networks,

00:37

alternative demand objects

00:39

controls

00:40

live data configurations, digitization templates and IW

00:44

live baselines

00:47

in the lock method.

00:48

Before you can change a version controlled object, it must be checked out.

00:52

However, newly created objects are checked out automatically.

00:57

Then for as long as you have the object checked out, no one else can change the object.

01:02

And when you have finished working on the object, you must check it back in

01:06

objects need to pass verification before they can be checked in.

01:11

When using the lock method. There are two important things to be aware of

01:15

the lock method will only apply to version controlled

01:17

objects whenever the merge method is not selected.

01:20

And there is no revision history in this system.

01:24

The merge method is present in newer versions of info

01:27

works. WS pro

01:29

this version control supports multiuser editing and scenarios

01:33

and it offers full revision history as well.

01:37

Using the merge method.

01:38

Most of the same objects can be version controlled except for IWW

01:42

live baselines.

01:45

Merge version control is automatically assigned to a database.

01:50

If you wish to use the lock method, it must be switched on in the database settings.

01:56

There are some important things to be aware of. When using the merge method,

01:60

you can get another user's changes at any point in your workflow.

02:03

And while making any changes of your own,

02:07

you commit your changes to the database so that other users can see them,

02:11

you resolve any conflicts between what you have

02:14

committed and what other users have committed.

Video transcript

00:04

Before you start using info works.

00:05

WS pro it is important to understand how its version control systems work.

00:11

There are two methods for managing version controlled objects.

00:14

The lock method and the merge method,

00:17

the lock method is the legacy version control system better known as check in.

00:22

Check out

00:24

in this version control system objects are locked for editing

00:27

until you check them out before working on them.

00:30

Using the lock method.

00:32

The objects that are version controlled include geo explorers networks,

00:37

alternative demand objects

00:39

controls

00:40

live data configurations, digitization templates and IW

00:44

live baselines

00:47

in the lock method.

00:48

Before you can change a version controlled object, it must be checked out.

00:52

However, newly created objects are checked out automatically.

00:57

Then for as long as you have the object checked out, no one else can change the object.

01:02

And when you have finished working on the object, you must check it back in

01:06

objects need to pass verification before they can be checked in.

01:11

When using the lock method. There are two important things to be aware of

01:15

the lock method will only apply to version controlled

01:17

objects whenever the merge method is not selected.

01:20

And there is no revision history in this system.

01:24

The merge method is present in newer versions of info

01:27

works. WS pro

01:29

this version control supports multiuser editing and scenarios

01:33

and it offers full revision history as well.

01:37

Using the merge method.

01:38

Most of the same objects can be version controlled except for IWW

01:42

live baselines.

01:45

Merge version control is automatically assigned to a database.

01:50

If you wish to use the lock method, it must be switched on in the database settings.

01:56

There are some important things to be aware of. When using the merge method,

01:60

you can get another user's changes at any point in your workflow.

02:03

And while making any changes of your own,

02:07

you commit your changes to the database so that other users can see them,

02:11

you resolve any conflicts between what you have

02:14

committed and what other users have committed.

Step-by-step Guide

Before using InfoWorks WS Pro, it is important to understand how its version control systems work. There are two methods for managing version-controlled objects: the lock method and the merge method.

The lock method is the legacy version control system, better known as “Check In/Check Out.” In this version control system, objects are locked for editing until you  “check them out” to work on them.

Using the lock method, version-controlled objects include:

  • GeoExplorers
  • networks
  • alternative demand objects
  • controls
  • live data configurations
  • digitization templates
  • IWLive baselines

In the lock method, before changing a version-controlled object, it must be checked out; however, newly created objects are checked out automatically. Then, for as long as an object is checked out, no one else can change it. When finished working on the object, it must first pass verification, and then be checked back in.

IMPORTANT:

  • The lock method will only apply to version-controlled objects when the merge method is not selected.
  • There is no revision history with the lock method.

The merge method is present in newer versions of InfoWorks WS Pro. This version control supports multi-user editing and scenarios, and it offers full revision history.

Using the merge method, most of the same objects can be version-controlled, except for IWLive baselines. Merge version control is automatically assigned to a database. If you wish to use the lock method, it must be switched on in the database settings.

IMPORTANT:

  1. You can get other users’ changes at any point in the workflow, even while making your own changes.
  2. Committing changes to the database allows other users to see them.
  3. You can resolve conflicts between what you and others have committed.
Was this information helpful?