Refer below link for frequently used GIT commands and git conflicts
Want to learn more about GIT and go through all posts related to GIT for SDET then do check out HERE
Git merge conflicts
Version control systems are all about managing contributions between multiple distributed authors ( usually developers ). Sometimes multiple developers may try to edit the same content. If Developer A tries to edit the code that Developer B is editing, a conflict may occur. To alleviate the occurrence of conflicts, developers will work in separate isolated branches. The git merge command's primary responsibility is to combine separate branches and resolve any conflicting edits.
Git merge Conflicts generally arise when two people have changed the same lines in a file, or if one developer deleted a file while another developer was modifying it. In these cases, Git cannot automatically determine what is correct. Conflicts only affect the developer conducting the merge, the rest of the team is unaware of the conflict. Git will mark the file as being conflicted and halt the merging process. It is then the developers' responsibility to resolve the conflict.
"Remember that if you are planning to move to SDET role, then expertise in GIT is non negotiable."
qa #automation #devops #interview #testautomation #softwaretesting #github #gitcommands #testing #testers #sdet #gitops #sourcecode #learningtech #learning #team #developer #people
Follow @sidharth88 for more posts
Top comments (0)