[SOLVED] Managing clearcase workflow in github

Managing clearcase workflow in github

I am having hard time devising a workflow for github now that we have swtiched over from clearcase ucm to github.

In clearcase ucm, I just had a development stream and an integration stream. all developers check in under dev stream which finally gets merged to int stream and baselined.

How can the same thing be done in github?

Solution

A stream in ClearCase is a akin to a Git branch in order for multiple developers to collaborate to a common development effort (by delivering/rebasing to that stream)

Since Git is a distributed VCS, you can achieve the same collaboration by:

making local commit to a branch (typically dev for development)
pushing those commits to a common remote repo

If others have already pushed their own commits (like a deliver), you would git pull --rebase first (a bit like a rebase), resolve any conflict, and push back.

A true Git workflow would involve feature branches, that you would then combine and merge to a dev branch, then an integration branch, then, for release, master. Like gitworkflow.

The remote repo can be managed by a Git repository hosting service, like GitHub, BitBucket or Gitlab.