Lab Primer: Merging README Updates - IsaiahSavage/faithlink-mvp GitHub Wiki

How will you merge everyone’s changes into the master (main) branch?

  1. Merge one of the three branches.
  2. Have others pull the changes down and redo their info in the proper format.

Did you encounter any issues?

  1. The only issue was the merge conflict due to us all creating the same section: image

What did you do to work around these difficulties?

We redid two of the three branches to work around the difficulties. Now all three branches are successfully merge-able: image image image