From 29138ce48095e14f2df26443d17175b90dc8eafb Mon Sep 17 00:00:00 2001 From: Colin Jaffe Date: Wed, 10 Feb 2021 10:30:39 -0500 Subject: [PATCH] Initial draft, needs some details. --- README.md | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8180da5..28a8c2a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,29 @@ # Formless and Void -A form-and-git project. +A form-inputs-and-git-collaboration project. + +### The Basics + +You'll be working **in groups** to make a form, with: + +- The content that you (and your partners) decide on... be creative! +- Whatever form field types you want... go wild! +- Automatic printing of results thanks to the bit of JavaScript in `main.js`... don't touch! + +### What Form + +### Git Collaboration + +You're going to work on this together using `git`. Here are your basic steps. + +- One teammate will fork this repo. This will be the repo that everyone submits as an assignment. +- That teammate will add the other team members as "Collaborators". +- You will all `git clone` the repository to your machines. +- When it's someone else's turn to "drive", the current driver can push up (`git add` and `git commit -m "[some message]"` first!), and the new driver will do a `git pull` to get the changes the previous driver added. +- Always always _always_ `pull` before you start working. +- Repeat until you're done! (Make sure to push one final time.) + +### Resources + +[All form input types.](https://www.w3schools.com/html/html_form_input_types.asp) +[Resolving merge conflicts.](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts)