Resolving a SRCTOGIT source member commit issue if someone has already committed a change on remote repository
There might be times where someone changes and commits a source member on Github or using a PC editor such as VS Code outside of the IBM i source physical file. That change gets committed to your remote repository. However the change may not been pulled back into the IBM i Source Physical File yet via the SRCFRMGIT command to sync things up before making changes on the IBM i.
A remote change not reflected in your IBM i source files may cause a merge conflict the next time you try to commit your source member with SRCTOGIT with *COMMITSYNC for the COMMITOPT parameter.
What should you do if you get a merge conflict error ?
Edit your source member from the source file with SEU, RDI or VS Code and make at least one change or correction to the source member to get it in the state you want. Then re-commit the source to git via SRCTOGIT with *COMMITSYNC.
Running SRCTOGIT/*COMMITSYNC will commit the source member updates locally in the IBM i source file, commit the source member into the local IFS git repository and then will pull and push the local IFS source copy to merge remote changes with our repository. This hopefully should result in a successful commit.
Let's just say that you ran PDM option GE to run the SRCTOGIT command from PDM, RDI or VS Code with the *COMMITSYNC option and got something like the following error in your job log or terminal session (DSPJOBLOG command on 5250):
------------------------------.
Begin Stdout Git.
------------------------------.
remote: Enumerating objects: 7, done..
remote: Counting objects: 14% (1/7) remote: Counting objects:
28% (2/7) remote: Counting objects: 42% (3/7) remote:
Counting objects: 57% (4/7) remote: Counting objects: 71%
(5/7) remote: Counting objects: 85% (6/7) remote:
Counting objects: 100% (7/7) remote: Counting objects: 100%
(7/7), done..
remote: Compressing objects: 25% (1/4) remote: Compressing
objects: 50% (2/4) remote: Compressing objects: 75% (3/4)
remote: Compressing objects: 100% (4/4) remote: Compressing
objects: 75% (3/4)Unpacking objects: 100% (4/4)Unpacking objects:
100% (4/4), 802 bytes | 16.00 KiB/s, done..
From ssh://github.com:/richardschoen/GITTEST123.
751cc24..a922280 master -> origin/master.
Auto-merging QRPGLESRC/HELLO.RPGLE.
CONFLICT (content): Merge conflict in QRPGLESRC/HELLO.RPGLE.
Automatic merge failed; fix conflicts and then commit the result..
------------------------------.
End Stdout Git.
------------------------------.
Errors 00001 occurred while running git operation. Check the joblog.
Errors occurred while exporting source member to the IFS for git. Check
the job log.
When this happens you need to resolve the merge conflict and then re-commit the source member to get things back on track.
The first thing to do is to review the IFS version of the source member that was just pulled from GitHub during the last SRCTOGIT with *COMMITSYNC.
The IFS version most likely has the marked up changes that were in conflict after the merge conflict happened.
The IFS version of the source is most likely NOT reflected in your IBM i source file yet. So next you need to review the corresponding version of the source in the source physical file.
Open the source member from your source physical file for editing via SEU, RDI or VS Code and make all the desired source changes that you want to preserve in the git repository for this source member.
Then save the source member and use the PDM GE option, or an RDI or VS Code action to run the SRCTOGIT command again with *COMMITSYNC.
This should resolve your source merge conflict issue.
If this doesn't resolve your conflict, let us know.