add assignment howtos - Githubissues

anushalihala commented 5 years ago

Thanks for the tip! I didn't know about squashing 😃 (also I found out about accepting changes in a batch after i'd already accepted a few individually - sorry about that) But since toolkitten is quite a large repo, I'd rather avoid cloning it at the moment 😅 Do you think you could 'Squash and merge' once the howtos are ready? Thanks

ilonabudapesti commented 5 years ago

Hi @anushalihala, thanks for the quick response.

I cannot accept the PR with so many commits. If I did it and then squashed and pushed, you would lose credit anyway because my commit would overwrite all of yours and you would be erased from the contribution history. I can do it if you want, but it's not for your best interest: because you want to show contribution to open source it's better if you are listed as contributor.

I don't quite understand. Don't you have the repo forked and cloned anyway? How did you push up your changes, did you do it just in the browser?

If yes I can save both of us time and copy your changes and merge them in. You will not show as contributor this way either.

Lmk <3

anushalihala commented 5 years ago

Yes, I made them in the browser.

Ok, thank you for explaining it to me. I will remove the line breaks and then squash.

anushalihala commented 5 years ago

Hello, I've managed to squash all the recent commits related to the howtos but Im not sure how to squash the older ones. Do you think you could take a look at my fork on GitKraken and help me with it? Thanks

ilonabudapesti commented 5 years ago

Yes, I can help you with that. I'll ask Ola to schedule a session. Xoxo

anushalihala commented 5 years ago

Hi @ilonabudapesti 🙂 After a somewhat terrifying process I managed to clean up my branch. Hope its all right now! Also made a few additional changes - did not squash the last commit so that it would be easier to see them. (I altered the bot so that hw can be resubmitted by reopening the PR instead of creating a new PR. I think this should be better since learners are working on one PR now instead of multiple PRs. Maybe we can use this process and release the howtos for the time-being until a better solution is found. )

Summary of actions performed on branch;

I wanted to try squashing the older merge commits again
I found that it was possible to squash the top 2 commits (unlike squashing all the previous commits together, which didnt give the squash option) and proceeded to do this for all the older commits
That left this pull request with 2 commits but somehow 195 or so changed files
I then rebased assignment-howtos branch onto 1millionwomentotech/master, which gave the current branch structure.

ilonabudapesti commented 5 years ago

@anushalihala Well done! You fought with git and won. I am grateful that you are so skillful in acquiring and applying new skills.

Accepting this now and merging.

1millionwomentotech / toolkitten

add assignment howtos #365