Giter Club home page Giter Club logo

team-workflow's Introduction

It is A basic web page with semantic layout, developed collaboratively using branches.
It's not very interesting to look at.

To do

  1. Programmer 1 creates a new GitHub repo and clones it
  2. Programmer 1 Raise issues on the work to be done.
  3. Programmer 2 clones the repo
  4. Both programmers Create and move to a new branch
  5. Write enough HTML & CSS for each branch
  6. Push the local version up to GitHub 7.Create a pull request
  7. Programmer 2 merges the pull request of programmer 1 and vise-versa
  8. Programmer 1 closes the issue of programmer 2 and vise-versa
  9. Both programmers resolve the conflict of a branch they are trying to merge.
  • What went well? What was challenging?

-communication was hard. It is suggested that next time to use zoom .

  • Was it clear exactly what code you needed to write?Was it clear exactly what code your team mates needed to write?

Since there was no prototype that was agreed upon, we both have difficulties following each others work. i.e. we have encountered many merge conflicts.

team-workflow's People

Contributors

gelilaa avatar lujianna avatar

Watchers

James Cloos avatar avatar

team-workflow's Issues

create a branch references

4. references

As a site visitor, I want to know where I can learn more

assigned to Anna

Repository

  1. This user story was developed locally by anna on a brach called references.
  2. The new branch was pushed to the shared repository
  3. A pull request was made to master & reviewed by the team
  4. Changes were merged to master

HTML

  • aside element
  • some links for people to learn more about the cool thing

CSS

Styling for the new element

create a branch main-text

3. main text

As a site visitor, I want to learn about something cool

assigned to Anna

Repository

  1. This user story was developed locally by anna on a branch called main-text.
  2. The new branch was pushed to the shared repository
  3. A pull request was made to master & reviewed by the team
  4. Changes were merged to master

HTML

  • article element
  • something cool that everyone needs to know

CSS

Styling for the new element

fixing the introduction branch

The introduction branch was deleted due to merge conflict. But the Branch is necessary for the project and must be included before adding any other branches.

create introduction

Repository

  1. This user story was developed locally by Gelila on a brach called introduction.
  2. The new branch was pushed to the shared repository
  3. A pull request was made to master & reviewed by the team
  4. Changes were merged to master

HTML

  • section element
  • some nice text in the section introducing users to this web page

CSS

Styling for the new element

create a title

Repository

  1. This user story was developed locally by Gelilaa on a brach called title.
  2. The new branch was pushed to the shared repository
  3. A pull request was made to master & reviewed by the team
  4. Changes were merged to master

HTML

  • A header element with a title describing the web page
  • A pleasant footer

CSS

  • Layout styling for the header & footer
  • Text styling for the main title

finishing touches

5. Finishing Touches

assigned to Gelila

As a perfectionist, I want everything perfect :)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.