During the last 2 hours of the workshop, the participants worked on tasks from their team project board to write sections of their team markdown file in their own branch. Then they merged their work together. All work was done in the browser. Participants did not need to download anything.
- Team (3 participants) developed some ideas and tasks and put those on their project board.
- Each team member created a branch for them to work on.
- Each team member grabbed a task from the board, moved to working on column, and then began editing their team markdown file, e.g.
bridges.md. - One by one, and working together, each team member did a pull request and merged content into the main branch.
- The team worked together to resolve merge conflicts in the browser via the GitHub resolve merge conflict page.
With the team markdown files.
