This document contains the shared notes activities, some direct identifiers have been removed.
(doesn't have to be work/technical)
If we could still have a Zoom in the morning?
What are the Git commands that are needed to get the same info as the usethis::git_sitrep() in R?
Where should we write our gitHub information?
Comment: Sorry about the audio, now (since 10:52) you should be hearing everybody. Is the sound level okay? Can you hear everybody clearly? Please write here in the notes any issues you see with the streaming too and we will take care of them :)
What to do next when we add the accounts?
https://coderefinery.github.io/git-collaborative/
what is the difference between cloning and forking?
what should we do cloning or forking? As far as i understand forking is possible if the repositoiry is public
where is the template?
:::warning Please accept the invitation to join the cr-workshop-exercise repository. It is in your mailbox.
(This applies if you opened an issue to access the cr-workshop-exercise organization on github. We can't give you access, we can send you an invitation that you have to accept)
We still have 7 invitations pending! One of these might be you! :::
But i am there and see all the participants
I am in the list :100:
I am in template what should i do?
::: info
https://coderefinery.github.io/git-collaborative/same-repository/#exercise
I am
done: oo
working on it:
skipping it: :::
And if we have some conflicts?
i have reated new branch and commited. do you see my commit? *7?
I see that i have commit and how can i do pull request?
I made pull request i await of approval, what should i do? :100:
Should i merge it to main branch?
I have commited from my branch, then i suppouse it should be merged to the main branch, right?
Do you see my branch?
yes i follow the template, created the branch, change the strawberries make commit and pull request
i see the commits
do you see my pull request?
do you have recommendation for a GH template (what should be included etc?)
i see three pull request and mine is among them
I have reviewed someone's pull request and i think it merged? or not?
How can we solve the conflicts? will we do that?
May i merge pull request of somebody?
One can consider the conflict for example i change to 2 strawberries, and someone the same to 3, what could be done then?
Solving the conflicts is very imposrtant +1
how to create a pull request from command line and connect it to the issue?
#NNN text to the commit title or message somewhere and it automatically finds it.
#NNN being the number of the issue? (i.e. #12)If you are a member of only the org, but not the exercise team you will not have the option to create a branch. If that's the case, open a new issue just as before and we will make sure you are added the the team.
When I review someone elses PR, should I always leave a message? Or is it okay to sometimes approve without a message?
When I review a PR that makes many changes, how deeply should I check that everything works? Do I more check there's no weird dependencies and the code runs, or should I also comb it line for line checking that all the logic is perfect? Sometimes I get asked to review code where I don't know what it does that intimately...
A bit out of topic but do you let a coding agent to do committs and pull requests on your behalf?
I was working locally and now do not know how to create the pull request
! [remote rejected] main -> main (protected branch hook declined)
error: failed to push some refs to 'https://github.com/cr-workshop-exercises/centralized-workflow-exercise'
git switch -c <my-new-branch>
git push origin <my-new-branch>
I have merged someones PR, however the branch merged stright into the main directory, rather than under a subsection of a recipe. How would one go about fixing the folder/repo structures then?
What if you have entered the wrong issue number (which is existing)in the PR? Is the other issue just closed by chance?
just to clarify, one cant do an PR from the CLI? Just on GH or VScode etc.?
Just made a new Issue xxxx - how to make a branch from the Issue in Main, or am I missing something?
:::info
https://coderefinery.github.io/git-collaborative/code-review/#exercise :::
Comment: please check others' PRs and add comments or suggestions!
Comment: Remember to check back your PR in case there are comments or reviews that require your attention (your branch might be ready to merge)
Are people notified that they need to review?
I previously did a draft pull request. Now i made a new branch and did the exercise where i made changes with typos and mistakes. I applied suggestions for the typo, and then did git pull and changed the bigger mistake. now when i pushed, my change from the draft pull request is also there... why?
git log --graph --oneline --decorate --all is the command I use for this, better to use an alias - it's also somewhere in the lesson material)what does it mean : close issue and how to reopen it
:::info
:::
Could you please, show in which case one should close issue, what does it mean and how to reopen it again?
but in my case it was no button to reopen
So that means i have no rights?
Will I get a warning if I forget to sync my fork before opening a pull request towards the upstream repository?
Could you please tell exactly the sequence_ first create new branch in your repository and then fork it?
after forking and returned to initial repository i lost my github
do you mean you got logged off?
yes, it is dissppeared in my window
i am confused with your explanations
very quickly andyou lost participant with such a manner
I think you make some explanation and then wait a little bit when people will repeat, that will be cleare
And you speak and speak and i didnÄt follow
the screen is b luerred, nothing is seen
With the gear icon, can you change it to source quality?
if you want, we can go through it again. Just let us know where you got stuck.
https://coderefinery.github.io/git-collaborative/forking-workflow/#how-to-contribute-changes-to-repositories-that-belong-to-others
Git related - but not course related question. Since I added testing and pre-commit hooks my python project is blocked from commiting as the Smart app center (SAC) from Windows is blocking it. As far as I understood pytest and pre-commit are running small helper .exe, that are blocked. Anyway do tackle this without switching the SAC off? Hardware is company owned, so I cant change to much :/
rm but also -r and -f, it needs to be a very deliberate actionHow to share the repository?
:::info
https://coderefinery.github.io/git-collaborative/forking-workflow/#exercise :::
git remote -v will show the origin and the one where it will be pushed with '(push)'git push --dry-run if needed (but the answer to your question is the comment above).:::info
:::
do you like some topics to revist or something unclear in the next 10 min? or
Would you run automated tests as part of a hook?
In which language this hooks is written?
.
:::info
Any other questions:
What level is the shell tutorial on Monday? Is it for complete beginners or might I benefit from it as a kind-of beginner that already uses it regularly? :(
I always hear how productive devs are in theire favourite editor -> would you agree with that statement, knowing shortcuts etc. bumping productivity to the max - or does it not really matter
Corrected the Issue #xxxx and Issue #xxxx, but it was not merged, was there some problems still in automated testin or someting else?
Many thanks!