1

What is the Clearcase equivalent of git's no fast forward (--no-ff) switch? Or how can I achieve the same functionality?

BACKGROUND

The situation is we are running multiple release branches and we need to be able to pull a feature or defect fix from the release branch if required. Currently (and I'm not the one managing Clearcase) all defect work is checked directly into the release branch, so backing out changes is time-consuming and potentially error-prone.

When using git with --no-ff, I can back out a feature or defect very quickly with minimal chance of causing an issue.

DarrellNorton
  • 3,901
  • 2
  • 21
  • 21

2 Answers2

0

In ClearCase, you would instead cancel an activity (if you are using ClearCase UCM), or cancelling merges for a set of files with negative merges.

But there is no notion of "fast-forward": there is no HEAD to move, only versions (file by file) to merge. So if you know the merged versions, you can create new versions which cancel them (that is what the negative merge does).

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
-1

There is no ff but there is also no HEAD in clearcase in the sense of git. The workflow is different. You always check in your code to a new checkin (or commit in git terminology). So it is like you are always doing a merge commit

Cratylus
  • 52,998
  • 69
  • 209
  • 339