Tutorial should be made more group based

[ZooeyMiller]

In FAC10, pretty much everyone did this workshop solo, I think it should be done in partners. The solo aspect of this tutorial led to some people getting quite confused about flow when working on their first projects in their groups.

The current process for the introduction section is essentially:

1. Fork and clone a repo
2. Create a new branch
3. Make a change to a file in your new branch
4. Add and commit changes
5. Pull master branch to make sure local master is up to date
6. Merge new branch with master
7. Push your new branch
8. Make a pull request for your new branch to your own forked master branch
9. Merge your new branch with your master branch
10. Pull updates from remote master to local master
11. practice dealing with merge conflicts with a pre-made branch

I think perhaps this could be adapted to be more partner based, rather than one person doing everything, which accidentally teaches bad practices like merging your own pull requests.

[NataliaLKB]

@ZooeyMiller great point! Have time to make a section for this? Maybe called Practise with a Partner ?

[ZooeyMiller]

@NataliaLKB I haven't done any actioning re: this, I think @PiotrBerebecki did some work on a git workshop for pairs? If not I'm happy to work on some stuff during the coming week.

[jsms90]

@ZooeyMiller is refering to this repo that @PiotrBerebecki created right after completing this workshop in week 1.

I wouldn't want to discourage anyone from making updates at any time during the course!

But @NataliaLKB, FAC10 are starting a week of curriculum planning tomorrow, where they will be choosing the week(s) that they intend to mentor. So it might be worth holding off on assigning anyone in particular to this, until they've made those choices?

[NataliaLKB]

@jsms90 Anyone can assign themselves at any time to an issue on an open source repo 😄 ! Do what you like.

If no one wants to take on this task though, I will close this issue.

Thanks both @ZooeyMiller @jsms90

[ZooeyMiller]

@NataliaLKB Thanks, that's awesome, maybe tomorrow in our curriculum planning meeting we'll decide whether to fork your repo and work on changing it or to work from scratch/Piotr's? If we choose the former I will assign myself tomorrow, if not I will close the issue.

[NataliaLKB]

@ZooeyMiller you don't have to fork the repo to make changes. You can make a PR anytime! Thats why this is open source 😄 .

Thanks!

[jsms90]

@NataliaLKB Until you invited me to this repo, I couldn't do anything other than comment. I think you might have to change something about your settings?

@ZooeyMiller If Natalia agrees, I would strongly encourage you guys to find a way of incorporating a pair-based approach into the instructions of this repo. It's highly unlikely that you will decide to teach vastly different concepts, and it would be a shame not throw away existing resources, rather than build on them?

It may not be possible. But that would be my suggestion?

[NataliaLKB]

@jsms90

I couldn't do anything other than comment

But you made a PR before I added you. All adding you as a collaborator did was give you push access to the repo. Unless I have misunderstood something?

I have looked but I can't give blanket push access to everyone - nor would I want to. As long as people can make PRs I don't mind merging them.

If Natalia agrees, I would strongly encourage you guys to find a way of incorporating a pair-based approach into the instructions of this repo. It's highly unlikely that you will decide to teach vastly different concepts, and it would be a shame not throw away existing resources, rather than build on them?

💯 totally fine by me! A few people in the past have talked to me about adding a section like you have described, but no one has made a PR yet. Would love if that happened.

[jsms90]

@NataliaLKB Sorry, "I couldn't do anything other than comment" was supposed to be in direct response to

@jsms90 Anyone can assign themselves at any time to an issue on an open source repo :smile: ! Do what you like.

Without being added as a collaborator, you don't have rights to do anything on this repo. Anyone is always able to fork it. They can then do whatever they want to that forked version. You're also free to submit PRs, form the forked version.

I didn't have push access to this repo. Likewise, I couldn't do things like assign myself or anyone else to the issues. Until you add someone as a collaborator, they have no access to this version.

That's why the whole fork & PR process is so huge. Because that's what you have to do if you're collaborating externally.

That was part of my whole thing about putting repos in foundersandcoders. Everyone in FAC is therefore automatically a collaborator. But there are a lot more things to consider, and ownership isn't just about ease of collaboration. Anyway, I'm getting off topic :yum: