Mastering Git for QA Automation | 3 Way Merge | Mukunthan Ragavan
Git for QA automation testers involves structuring the content to progressively build knowledge from basic to advanced git concepts.
This video talks about
3 Way Merge is a simple way to merge changes in Git where it identifies a common ancestor commit and compares changes in two branches relative to this base, attempting to automatically combine non-conflicting changes. Conflicting changes are flagged for manual resolution by developers to complete the merge.
Hands-on how 3 Way Merge Works
Common Base:
Represents the last shared state before the branches diverged. This common base helps in understanding what changes were made in each branch.
Master/feature tip:
Latest Commits are added to the feature branch & master branch (after diverged)
Merge commit:
Git automatically combine the changes from master & feature into a single, unified version. If changes do not overlap, they are merged smoothly. However, if there are conflicting changes (i.e., changes made to the same line or region of the code), the merge process will flag these conflicts. We must then manually resolve these conflicts to complete the merge.