Confirmed users
195
edits
m (edit) |
(edit) |
||
| Line 169: | Line 169: | ||
:''Tip:'' | :''Tip:'' | ||
::* If you need to stop in the middle of Steps 2-7 and start over later, it's a good idea to start over again at Step 2. This helps to avoid merge conflicts. If you do experience a merge conflict (Github will tell you!), try googling to find a solution or reach out to some of your dev teammates to help you through it. | ::* If you need to stop in the middle of Steps 2-7 and start over later, it's a good idea to start over again at Step 2. This helps to avoid merge conflicts. | ||
::* If you do experience a merge conflict (Github will tell you!), try googling to find a solution or reach out to some of your dev teammates to help you through it. | |||
=== Gathering Feedback from Team and Collaborators === | === Gathering Feedback from Team and Collaborators === | ||