Github

Links

• 2 factor authentication on github

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

HOWTO

Use ssh

• Generating a new SSH key for a hardware security key

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

Create pull request

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

This branch has conflicts that must be resolved

resvolve them :)

Password authentication is not supported for Git operations

Check:

• https://docs.github.com/en/authentication/connecting-to-github-with-ssh

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