Problem Note 67755: Git conflicts are difficult to fully resolve in the SAS® Studio interface
 |  |  |  |  |
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
| Product Family | Product | System | Product Release | SAS Release | ||
| Reported | Fixed* | Reported | Fixed* | |||
| SAS System | SAS Studio | Microsoft® Windows® for x64 | 3.8 | |||
| Microsoft Windows 8 Enterprise x64 | 3.8 | |||||
| Microsoft Windows 8 Enterprise 32-bit | 3.8 | |||||
| Microsoft Windows 8 Pro 32-bit | 3.8 | |||||
| Microsoft Windows 8 Pro x64 | 3.8 | |||||
| Microsoft Windows 8.1 Enterprise 32-bit | 3.8 | |||||
| Microsoft Windows 8.1 Enterprise x64 | 3.8 | |||||
| Microsoft Windows 8.1 Pro 32-bit | 3.8 | |||||
| Microsoft Windows 8.1 Pro x64 | 3.8 | |||||
| Microsoft Windows 10 | 3.8 | |||||
| Microsoft Windows 95/98 | 3.8 | |||||
| Microsoft Windows 2000 Advanced Server | 3.8 | |||||
| Microsoft Windows 2000 Datacenter Server | 3.8 | |||||
| Microsoft Windows 2000 Server | 3.8 | |||||
| Microsoft Windows 2000 Professional | 3.8 | |||||
| Microsoft Windows NT Workstation | 3.8 | |||||
| Microsoft Windows Server 2003 Datacenter Edition | 3.8 | |||||
| Microsoft Windows Server 2003 Enterprise Edition | 3.8 | |||||
| Microsoft Windows Server 2003 Standard Edition | 3.8 | |||||
| Microsoft Windows Server 2003 for x64 | 3.8 | |||||
| Microsoft Windows Server 2008 | 3.8 | |||||
| Microsoft Windows Server 2008 R2 | 3.8 | |||||
| Microsoft Windows Server 2008 for x64 | 3.8 | |||||
| Microsoft Windows Server 2012 Datacenter | 3.8 | |||||
| Microsoft Windows Server 2012 R2 Datacenter | 3.8 | |||||
| Microsoft Windows Server 2012 R2 Std | 3.8 | |||||
| Microsoft Windows Server 2012 Std | 3.8 | |||||
| Microsoft Windows Server 2016 | 3.8 | |||||
| Microsoft Windows Server 2019 | 3.8 | |||||
| Microsoft Windows XP Professional | 3.8 | |||||
| Windows 7 Enterprise 32 bit | 3.8 | |||||
| Windows 7 Enterprise x64 | 3.8 | |||||
| Windows 7 Home Premium 32 bit | 3.8 | |||||
| Windows 7 Home Premium x64 | 3.8 | |||||
| Windows 7 Professional 32 bit | 3.8 | |||||
| Windows 7 Professional x64 | 3.8 | |||||
| Windows 7 Ultimate 32 bit | 3.8 | |||||
| Windows 7 Ultimate x64 | 3.8 | |||||
| Windows Millennium Edition (Me) | 3.8 | |||||
| Windows Vista | 3.8 | |||||
| Windows Vista for x64 | 3.8 | |||||
| 64-bit Enabled AIX | 3.8 | |||||
| 64-bit Enabled Solaris | 3.8 | |||||
| HP-UX IPF | 3.8 | |||||
| Linux for x64 | 3.8 | |||||
| Solaris for x64 | 3.8 | |||||
| SAS System | SAS Studio for Viya | Linux for x64 | 5.2 | 2020.0.7 | Viya | Viya |
| Microsoft® Windows® for x64 | 5.2 | Viya | ||||
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
http://documentation.sas.com/?softwareId=administration&softwareVersion=3.5&softwareContextId=softwareUpdatesWinViya 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
http://documentation.sas.com/?softwareId=administration&softwareVersion=3.5&softwareContextId=softwareUpdatesA fix for this issue for Base SAS 9.4_M7 is available at:
https://tshf.sas.com/techsup/download/hotfix/HF2/I9R.html#67755A fix for this issue for SAS Studio 3.81 is available at:
https://tshf.sas.com/techsup/download/hotfix/HF2/J7H.html#67755| Type: | Problem Note |
| Priority: | high |
| Date Modified: | 2021-08-31 13:17:24 |
| Date Created: | 2021-04-09 10:31:50 |