Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I would like to be added as a collaborator #221

Closed
AnnaChiaraSaccani opened this issue May 12, 2023 · 8 comments
Closed

I would like to be added as a collaborator #221

AnnaChiaraSaccani opened this issue May 12, 2023 · 8 comments
Assignees

Comments

@AnnaChiaraSaccani
Copy link
Collaborator

Anna Chiara Saccani - 532801as

@anamartinovici
Copy link
Owner

Hi @AnnaChiaraSaccani

I have added you as a collaborator to this repository. You need to accept the invite and then you should be able to push to this repository. If it all works fine, please close this issue. I have assigned you as 'responsible' for this, so you get to practice the feature.

@AnnaChiaraSaccani
Copy link
Collaborator Author

AnnaChiaraSaccani commented May 12, 2023 via email

@anamartinovici
Copy link
Owner

Hi @AnnaChiaraSaccani I think you might be using a Mac device. If that's correct, then the solution below should work.

This is a somehow old and common issue with RStudio and MacOS. For more details: STAT545-UBC/Discussion#93

Steps to make it work:

@AnnaChiaraSaccani
Copy link
Collaborator Author

I tried and now it says this: To https://github.com/anamartinovici/githubfun.git
! [rejected] HEAD -> main (fetch first)
error: failed to push some refs to 'https://github.com/anamartinovici/githubfun.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@anamartinovici
Copy link
Owner

@AnnaChiaraSaccani This is progress. The error is due to someone else having made a change to the repo between the moment when you've cloned it and the moment when you tried to push.
You need to follow the instructions in the errors message and (1) git pull and then (2) git push. The pull button is right next to the push button in the RStudio Git pane.

@AnnaChiaraSaccani
Copy link
Collaborator Author

When I pull it says this
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.

I tried to follow the instructions but the same happens

@anamartinovici
Copy link
Owner

Hi @AnnaChiaraSaccani I can help you out via Zoom. We can have a brief meeting now (I'm available until 15.30). Use the same Zoom link as for lectures.

@AnnaChiaraSaccani
Copy link
Collaborator Author

Thank you!! I'm joining now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants