When a conflict exists between commits when you are using either the GIT_COMMIT function or the commit interface in SAS Studio, you receive a message that you need to resolve the conflict before the commit can occur. However, resolving the conflict might be difficult to perform in SAS Studio.  

When a conflict occurs, the following two commits contribute to that conflict:

• the local commit
• the commit that you pulled down from the remote repository, or a commit that resides in another branch that you are merging into the current branch

After you resolve the conflict, you can create a new commit that completes the merge process. The GIT_COMMIT function knows about the local or current branch head commit, but it needs the commit ID of the remote commit, or the head commit of the branch that is being merged into the current branch.

Click the Hot Fix tab in this note for a link to instructions about accessing and applying the software update.

The hot fix provides an optional argument, second-parent-commit-ID, for the GIT_COMMIT function. This argument provides the new commit ID that is needed to complete the merge process when resolving conflicts. The syntax is updated as follows: 

In the SAS Studio interface, after the hot fix is applied, this process is handled automatically, using the same methodology that is used by Git software on a UNIX system.

Operating System and Release Information

Viya on Windows: An update for this issue is available for SAS Viya 3.5. For instructions on how to access and apply software updates, see the Updating Your SAS Viya software section in the SAS Viya 3.5 for Windows Deployment Guide at

Viya on Linux: An update for this issue is available for SAS Viya 3.5. For instructions on how to access and apply software updates, see the Updating Your SAS Viya software section in the SAS Viya 3.5 for Linux Deployment Guide at

A fix for this issue for Base SAS 9.4_M7 is available at:

A fix for this issue for SAS Studio 3.81 is available at: