Developer workflow using Git integration

About this task

The primary use case targets developers who work with familiar Integrated Development Environments (IDEs) or toolsets that integrate with Git. In this model, ClearCase is not required to be installed on the client system, and all development activities are performed using standard Git commands. When interaction with ClearCase content is required, integration operations are initiated and completed through the ClearCase GitView web interface, without requiring developers to directly use ClearCase commands.

Procedure

  • Typical Developer workflow
    1. The developer logs in to the ClearCase GitView web interface and creates a GitView for a specified ClearCase UCM project.
      • A ClearCase snapshot view is created and initialized as a Git repository.
    2. The Git repository is cloned to the client system, and development work is performed locally.
    3. Upon completion of the work, changes are committed to the Git master or main branch in the local repository.
    4. The changes are pushed to the server-hosted Git repository.
      • As a result, the ClearCase GitView is updated, and the changes are checked in to the ClearCase development stream.
    5. The developer logs in to the ClearCase GitView web interface and initiates a deliver operation.
      • Files are checked out in the ClearCase integration stream, and a merge operation is initiated.
      • Any merge conflicts are resolved by using the web interface.
    6. The deliver operation is completed by using the ClearCase GitView web interface.
  • Workflow for an additional Developer

    To retrieve the integrated changes locally, an additional developer can perform the following steps, assuming that a ClearCase GitView already exists and a ClearCase release engineer has created and recommended a new baseline on the integration stream that contains the delivered changes:

    1. The developer logs in to the ClearCase GitView web interface and initiates a rebase operation.
      • Changes from the ClearCase integration stream are merged into the ClearCase development stream.
      • Any conflicts are resolved by using the web interface.
    2. The rebase operation is completed from the ClearCase GitView web interface.
      • The merged changes are committed to the Git master or main branch. The merged changes are committed to the Git master or main branch.
    3. A Git pull operation is performed to fetch the latest changes into the local Git repository.