When Git Can't Auto-Merge A conflict means two branches changed the same lines and Git needs a human to decide the outcome. It marks the disputed section directly in the file rather than guessing. Staging a file with `git add` after editing
Software
Software · L2 · Git & Dev Workflow: Resolving a Merge Conflict
What is the difference between `git fetch` and `git pull`?1 / 10
`git fetch` downloads remote changes into the remote-tracking branch but does NOT change your working directory. `git pull` = `git fetch` + `git merge` (or rebase with `--rebase`). Fetching first lets you review changes before integrating.
State the three Kolmogorov axioms of probability.1 / 10
1) P(A) ≥ 0 for all events A. 2) P(Ω) = 1 (the sample space has probability 1). 3) For mutually exclusive events: P(A₁ ∪ A₂ ∪ …) = ΣP(Aᵢ). All other probability rules follow from these.
What is the glomerular filtration rate (GFR), and what is a typical value in a healthy adult?1 / 10
GFR is the volume of filtrate formed by both kidneys per minute, typically ~125 mL/min (~180 L/day). Only ~1-1.5 L is excreted as urine each day because more than 99% of the filtrate is reabsorbed along the nephron.
Herd immunity is protection at the level of a whole population, not just an individual. When enough people in a community are immune to a disease — through vaccination or past infection — the disease struggles to find new hosts to infect, so it stops spreading easily even to people who are not immune.