Viewing Git Status
The status of an object in Git is displayed in the Git Status column. This column is available in any view that is used to list repository details such as the Repository view, Version Control tab and lists viewed in the Favourites view. See Information about Objects for instructions on how to show/hide columns.
The following is the list of possible statuses:
| Value
|
Description
|
|
No value (blank)
|
The object's YAML file is identical to the version in the current branch in Git.
|
|
New
|
The object has been added to version control but has not been added to the Git repository.
|
|
Deleted
|
The object's YAML file has been deleted. Either the object has been deleted from Visual LANSA or has been "Removed from Version Control".
|
|
Renamed
|
The YAML file has been renamed through the Git command line or a third party tool.
|
|
Conflict
|
A merge has been attempted but cannot be automatically resolved. For example, the same line of RDML has been modified in commits on two different branches. When those branches are merged, that object will be in conflict.
This must be resolved using one of the following methods:
- The Resolve Conflict menu option. This will launch KDiff3.
- Externally using the Git command line
- Externally using another third party tool.
A merge conflict may cause the Version Control Status to change to Invalid YAML because Git (or any other version control product being used) has added text into the YAML file to indicate where the conflict exists.
|
|
Unknown
|
An error has occurred in the Git interface.
|
|
In the Version Control tab, the Git Status column is also used to show the current branch for a given repository. That is, for folders which contain a Git repository (
), this column will show the current branch.