Skip to content

README.md

Latest commit

 

History

History
26 lines (20 loc) · 954 Bytes

README.md

File metadata and controls

26 lines (20 loc) · 954 Bytes
Raw

Changes I Made To The Pull Request - Project Reflection

The steps you took to create and manage branches.

  1. Used The Following command to create a branch - git checkout -b branch_name
  2. Took the following steps to simulate a merge conflict
    1. create branch feature/header
    2. switch back to main
    3. create branch feature/footer
    4. switch back to feature/header and add a different footer
    5. merge feature/footer to main
    6. attempt to merge feature/header with changes to footer to main branch
    7. Got a merge conflict
    8. Resolved conflict
    9. Push changes to main
    10. create branch review/main
      1. add README.md

How you handled the merge conflict.

  1. Removed unwanted code (footer with older date and kept the footer with new date)
  2. commited changes and merged to main

How the pull request process helped you ensure code quality and collaboration.

  1. Peer Review was very positive and encouraging :)