-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
ab21e59
commit 29138ce
Showing
1 changed file
with
27 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |