More generally though, conflicts can happen whenever a file is forked, that is two states of the file have the same common ancestor, and both states want to be accepted in a repository workspace.

Forked or divided into two parts or branches, as the Y-shaped styles of certain flowers.

For these common problems in mechanical machining, special fixtures for two special parts, a forked part and a steering joint, were designed and accordingly two proper processes were introduced.