Forum Discussion

Vars01's avatar
Vars01
Occasional Contributor
4 years ago

issue with Merge Branch

 

Could any one help us on the below conflicts: 

 

Multiple User Scenario:
Scenario :
User 1: Push's new code to GitHub
User 2: Pull's code from GitHub and make changes .
User 1: Pull's the Code from Github and make changes to the code
User 1 : Pushes the code to github and create a pull request to merge (Pull Request 1)
User 2 : Pushes the code to github and create a pull request to merge (Pull Request 2)
User 1: Merge the code to main branch in github (Pull reuest 1 approves and merge successful)
User 2: Tries to merge the code gets Conflict error which cannot be resolved in github (Pull request 2)

Now in Test Complete
User 2 : Tries to pull the code from github main branch
getting the below error: 

From "Github repository" branch LatestMay5th_PermissionMatrix -> FETCH_HEAD
LatestMay5th_PermissionMatrix -> CreateNewFtRepo/LatestMay5th_PermissionMatrix

warning: Cannot merge binary files: DecisionNG/Test_Data.xlsx (HEAD vs. 3c5f745b3faf33981d26f18cfef90e2a4d949dfc) Auto-merging DecisionNG/Test_Data.xlsx CONFLICT (content): Merge conflict in DecisionNG/Test_Data.xlsx Auto-merging DecisionNG/DecisionNG_Automation/Script/SelectingOptionfromDropDown_Only1DDexsists.js CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/Script/SelectingOptionfromDropDown_Only1DDexsists.js Auto-merging DecisionNG/DecisionNG_Automation/Script/Script.tcScript CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/Script/Script.tcScript Auto-merging DecisionNG/DecisionNG_Automation/NameMapping/NameMapping.tcNM CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/NameMapping/NameMapping.tcNM Auto-merging DecisionNG/DecisionNG_Automation/NameMapping/Images/Images.NMimg Auto-merging DecisionNG/DecisionNG_Automation/KeywordTests/KeywordTests.tcKDT CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/KeywordTests/KeywordTests.tcKDT Auto-merging DecisionNG/DecisionNG_Automation/DecisionNG_Automation.mds.tcLS CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/DecisionNG_Automation.mds.tcLS Auto-merging DecisionNG/DecisionNG_Automation/DecisionNG_Automation.mds CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/DecisionNG_Automation.mds Auto-merging DecisionNG/DecisionNG.tcCfgExtender CONFLICT (content): Merge conflict in DecisionNG/DecisionNG.tcCfgExtender Automatic merge failed; fix conflicts and then commit the result.

  • mcculloughskyla's avatar
    mcculloughskyla
    Occasional Visitor
    4 years ago
    @PrepaidGiftBalance wrote:

     

    Could any one help us on the below conflicts: 

     

    Multiple User Scenario:
    Scenario :
    User 1: Push's new code to GitHub
    User 2: Pull's code from GitHub and make changes .
    User 1: Pull's the Code from Github and make changes to the code
    User 1 : Pushes the code to github and create a pull request to merge (Pull Request 1)
    User 2 : Pushes the code to github and create a pull request to merge (Pull Request 2)
    User 1: Merge the code to main branch in github (Pull reuest 1 approves and merge successful)
    User 2: Tries to merge the code gets Conflict error which cannot be resolved in github (Pull request 2)

    Now in Test Complete
    User 2 : Tries to pull the code from github main branch
    getting the below error: 

    From "Github repository" branch LatestMay5th_PermissionMatrix -> FETCH_HEAD
    LatestMay5th_PermissionMatrix -> CreateNewFtRepo/LatestMay5th_PermissionMatrix

    warning: Cannot merge binary files: DecisionNG/Test_Data.xlsx (HEAD vs. 3c5f745b3faf33981d26f18cfef90e2a4d949dfc) Auto-merging DecisionNG/Test_Data.xlsx CONFLICT (content): Merge conflict in DecisionNG/Test_Data.xlsx Auto-merging DecisionNG/DecisionNG_Automation/Script/SelectingOptionfromDropDown_Only1DDexsists.js CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/Script/SelectingOptionfromDropDown_Only1DDexsists.js Auto-merging DecisionNG/DecisionNG_Automation/Script/Script.tcScript CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/Script/Script.tcScript Auto-merging DecisionNG/DecisionNG_Automation/NameMapping/NameMapping.tcNM CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/NameMapping/NameMapping.tcNM Auto-merging DecisionNG/DecisionNG_Automation/NameMapping/Images/Images.NMimg Auto-merging DecisionNG/DecisionNG_Automation/KeywordTests/KeywordTests.tcKDT CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/KeywordTests/KeywordTests.tcKDT Auto-merging DecisionNG/DecisionNG_Automation/DecisionNG_Automation.mds.tcLS CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/DecisionNG_Automation.mds.tcLS Auto-merging DecisionNG/DecisionNG_Automation/DecisionNG_Automation.mds CONFLICT (content): Merge conflict in DecisionNG/DecisionNG_Automation/DecisionNG_Automation.mds Auto-merging DecisionNG/DecisionNG.tcCfgExtender CONFLICT (content): Merge conflict in DecisionNG/DecisionNG.tcCfgExtender Automatic merge failed; fix conflicts and then commit the result.

    Conflicts are going to happen if both branches have changes to the files. This is a good thing. Keeping your branches up-to-date with each other will prevent some of them . This will take the changes from branch_1 and append them to master without a merge commit.