Create a Guide/Template: How to resolve PR merge conflicts when another contributor made a previous PR

Dependency

• hackforla/peopledepot#166

Overview

We need documentation to guide developers in resolving this common problem. 2 devs start with the same base commit, the first one to create a PR is okay, but the 2nd dev to create a PR will have some conflicts in their PR, even though it runs fine.

Action Items

• write doc to explain and guide to find the solution
• check the website team's guide on the same topic
  • if there are common sections
    • copy the relevant portion into a new guide in the Engineering CoP docs repo. Note which projects are referencing the guide.
    • link from our docs while removing those sections
    • notify website team to examine the content and link it from their docs

Resources/Instructions

• Google Drive Folder for this Guide's documents and shortcuts (to documents in other locations) 0120 [DRAFT] How to resolve PR merge conflicts when another contributor made a previous PR
• website team's page on how to resolve merge conflicts

Discussion

The preferred solution is to rebase the new PR to the new HEAD of the main branch and resolve any conflicts so that the PR can be merged smoothly.

See discussion on this topic

Inizia con il file How-to-Resolve-Merge-Conflicts.md del team del sito web e con la discussione #169 di PeopleDepot collegata. Confronta le loro indicazioni con la guida Engineering CoP richiesta, quindi documenta il workflow di rebase e risoluzione dei conflitti, individua le sezioni condivise e collega o rimuovi i contenuti duplicati come appropriato. Il lavoro è completato quando la nuova guida e i riferimenti tra progetti sono aggiornati e il team del sito web è stato informato.