jt Jordan Tapke asked about forks vs. branches. A fork is a copy of someone else's repository. What about merge conflicts?