Github: resolving conflict
Conflict 1: hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull…
How to create a website from Quarto
source: https://quarto.org/docs/publishing/github-pages.html Download and install Quarto CLI from https://quarto.org/docs/download/ Open your terminal and go to your working directory (e.g. ~/projects/sunny-bak/) Create a quarto scaffolding for your project (template) called funsite;…
How to set up multiple ssh keys (accounts) in multiple workspaces
https://blog.gitguardian.com/8-easy-steps-to-set-up-multiple-git-accounts/ Create ssh keys using key-gen (id_personal, id_prof) Add keys using ssh-agent Create config file in ~/.ssh/config # ~/ssh/config Host * AddKeysToAgent yes UseKeychain yes IdentityFile ~/.ssh/<personal_key> Host * AddKeysToAgent…
How to handle conflicts in github
This happens a lot. I will try to write out scenarios I've dealt with.. Here are ways to deal with conflicts Decide to delete the file of conflict from Main…
How to work with a new github branch
Once you were able to properly authenticate and clone (download) a repository you have a read/write access to, it's time to create a new branch. Why create a branch? it's…
git, how to set up multiple ssh keys for github repositories
For creating one ssh key for all github repositories, go here Create ssh keys Go to .ssh directory under your user root directory (or anywhere you want to store your…
git warning: CRLF will be replaced by LF
I was trying to commit files that were created by other developer and I got the following warning. End of Line is handled differently by different operating systems, so When…