Trouble with git

[ToniVillaMercadal]

Let's comment here all the git-related problems that we find

[TomeuKuma]

Hi guys,

When I try to connect to Github from PyCharm's pull requests menu, it says that data cannot be loaded from GitHub:

"Although you appear to have the correct authorization credentials, the FragileTech organization has enabled OAuth App access restrictions, meaning that data access to third-parties is limited. "

It seems to me that 2FA is activated. Does it mean that somebody from FragileTech has to give me access?

[VicenteAR]

Hi guys,

When I try to connect to Github from PyCharm's pull requests menu, it says that data cannot be loaded from GitHub:

"Although you appear to have the correct authorization credentials, the FragileTech organization has enabled OAuth App access restrictions, meaning that data access to third-parties is limited. "

It seems to me that 2FA is activated. Does it mean that somebody from FragileTech has to give me access?

Hi,
I have a similar problem. I cannot push anything to the repositories, even to the ones that I have created. When I write
git push origin my-branch
the only answer that I get is:
remote: Invalid username or password.
fatal: Authentication failed for 'https://github.com/VicenteAR/mem.git/. I am completely sure that I am writing the correct password. Has this something to do with the two step verification process?

[VicenteAR]

Hi guys,
When I try to connect to Github from PyCharm's pull requests menu, it says that data cannot be loaded from GitHub:
"Although you appear to have the correct authorization credentials, the FragileTech organization has enabled OAuth App access restrictions, meaning that data access to third-parties is limited. "
It seems to me that 2FA is activated. Does it mean that somebody from FragileTech has to give me access?

Hi,
I have a similar problem. I cannot push anything to the repositories, even to the ones that I have created. When I write
git push origin my-branch
the only answer that I get is:
remote: Invalid username or password.
fatal: Authentication failed for 'https://github.com/VicenteAR/mem.git/. I am completely sure that I am writing the correct password. Has this something to do with the two step verification process?

Definitely, the issue was the two-step verification process. I leave the solution in case someone else has the same problem.
https://medium.com/@ginnyfahs/github-error-authentication-failed-from-command-line-3a545bfd0ca8

[Guillemdb]

Duly noted! I'm answering in 10, let me get a coffe.

[Guillemdb]

@TomeuKuma
When I try to connect to Github from PyCharm's pull requests menu, it says that data cannot be loaded from GitHub:

"Although you appear to have the correct authorization credentials, the FragileTech organization has enabled OAuth App access restrictions, meaning that data access to third-parties is limited. "

It seems to me that 2FA is activated. Does it mean that somebody from FragileTech has to give me access?

Do not use PyCharm to make the pull requests. I will look into it and make it available, but I need to figure out how to give permissions to the app. Push to your branch and then open a new PR using the GitHub interface.

[Guillemdb]

@VicenteAR This is probably because you clone the repo using https instead of ssh. It is possible that the 2FA interferes with your login. This is why you need to use ssh certificates.

You can create an ssh key following this tutorial

Try to delete your current clone, and when you clone it again make sure that you are clonining it using ssh. To do it, you can run

git clone git@github.com:FragileTech/guide.git

If the problem persists please let me know.

[VicenteAR]

I have just had a problem pushing changes to GitHub.

I updated my working branch to remote and opened a PR. I saw some minor errors and I corrected them in local. I tried to push my new changes to remote again (after rewriting my working branch to incorporate nicely my new adjustments) but Git gave me an error with the second push.

I tried rebasing again my local branch with remote, correcting my conflict errors, but I ended up with a mess and a hodgepodge of commits (as the second commit list of PR #21 reflects).

What is the correct way of updating new commits to a remote branch? Is it possible rebasing again the branch, after pushing to remote?

Update: the sequence of commands and the error were the following:
.............................................................................................
git push origin feature-rm
[new adjustments in local]

git commit --amend
git push origin feature-rm

and the error

 ! [rejected]        feature-rm -> feature-rm (non-fast-forward)
error: failed to push some refs to 'git@github.com:FragileTech/guide.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

After that, I tried pulling, pushing and rebasing (not in that order) to end finally with a mess.

[Guillemdb]

You can override the remote branch with the contents pushed from your local branch using git push -f instead of using git push.

If this is not what you are asking, please update your previous comment to include the error message. This way I can understand a bit better what is happening.

[VicenteAR]

You can override the remote branch with the contents pushed from your local branch using git push -f instead of using git push.

If this is not what you are asking, please update your previous comment to include the error message. This way I can understand a bit better what is happening.

Thanks! that solves the error. But is there a way to fix this without removing the remote content? Or is it mandatory?
(I have updated my previous comment)

[Guillemdb]

There needs to be a "true" git history somewhere. By default this is the remote branch, and when you use -f/--force what you are doing is telling Git that the true source is your local branch, and that it should have preference over the remote one.