We have been using Git and GitHub with connecting to CI-QBuild.
Our developers are merging source code into the main repository through the proof build provided by qbuild.
The developers typically run a proof build and then continue with code development on another branch like develop_feature1, develop_feature2 and so on.
In that case, the following critical issues occur in a local repository where the user agent is running.
1) The developer made a new commit in "develop" branch and then ran the proof build with the commit.
2) Next, developer changes another branch "develop_feature1" using "git checkout" command and continue with code development on it.
3) The following commands were executed sequentially in the developer local repository where the user agent was running
- git fetch origin develop
- git merge FETCH_HEAD
4) A lot of conflicts occurred during merging FETCH_HEAD. Those commands should be run in the develop branch, NOT develop_feature1 ( current working branch )
Error message) ( * please refer to the log "126.96.36.1992_Proof failed-Conflict")
Step 'Clone a Repository Into Build Server' is failed: Merge conflicts found. Please fix conflicts and merge first, then run the proof build again.