Github: Difference between revisions

From DWIKI
Tony (talk | contribs)
Tag: wikieditor
Tony (talk | contribs)
Tag: wikieditor
Line 18: Line 18:


=FAQ=
=FAQ=
==Error messages==
===The authenticity of host 'github.com (140.82.121.3)' can't be established. ===


==The authenticity of host 'github.com (140.82.121.3)' can't be established. ==
===git@github.com: Permission denied (publickey).===
   
Most likely github doesn't know your public key, try
  ssh -v T git@github.com
and check on your account: '''SSH and GPG keys -> SSH keys'''


== Create pull request ==


*https://opensource.com/article/19/7/create-pull-request-github




Line 42: Line 44:
Merge conflict, fixing it:
Merge conflict, fixing it:
  git mergetool
  git mergetool
== Create pull request ==
*https://opensource.com/article/19/7/create-pull-request-github

Revision as of 09:14, 2 February 2026

Links

https://github.com/drduh/YubiKey-Guide


HOWTO

Use ssh

On github.com go to Settings->SSH and GPG keys Add key: paste your public key Make sure your ssh client uses correct key:

Host github.com
  IdentityFile ~/.ssh/id_ed25519

And

git remote set-url origin git@github.com:username/repository.git

FAQ

Error messages

The authenticity of host 'github.com (140.82.121.3)' can't be established.

git@github.com: Permission denied (publickey).

Most likely github doesn't know your public key, try

ssh -v T git@github.com

and check on your account: SSH and GPG keys -> SSH keys



This branch has conflicts that must be resolved

resolve them :)

remote: Support for password authentication was removed

Password authentication is not supported for Git operations

Check:

or use Personal Acces Token instead: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token

Local copy contains "<<<<<<< HEAD"

Merge conflict, fixing it:

git mergetool


Create pull request