• Git is widely used version control system in software quality assurance services. Sometimes merge conflicts occurs in Git and there could be multiple reasons of conflicts and some of them are listed below:

    i) Edit on same line in same file
    ii) Some files are deleted
    iii) Multiple files with same name
    These could be checked with 'git status'.

    In order to resolve the conflicts, follow the below steps:
    a) Clean up the conflicts: Open the files in mergetool and Git would mark the conflicted areas like following:
    ‘<<<<< HEAD’ and ‘ >>>>> [other/branch/name]’

    b) In the end, commit again and then merge the current branch with the master one

    Best QA Outsourcing & Quality Assurance Company - QASource
    Reap the incomparable benefits of high quality offshore quality assurance services with QASource – Quality That Creates Value and deliver on time, ev…
This reply was deleted.
    results->result as $result) { ?>
  1. jobtitle;?>
    company;?>(formattedRelativeTime;?>)city;?>, state;?>
    Welcome to Mobile QA Zone, a Next Generation Software Testing Community.Invite your friends to join this community.Write to us to become a featured member.