working with git

As of August, 2021, github requires SSH authentication for usage. One can still have user/pwd for UI but SSH must be setup for console.

Configure SSH

Check / Generate the SSH key

ls -la ~/.ssh/
ssh-keygen -t ed25519 -C "[email protected]" (enter for default values)
add the public key to the SSH section of your github
add the ssh key to the local ssh agent (ssh-add -K /Users/you/.ssh/id_rsa)

Reference: https://www.atlassian.com/git/tutorials/git-ssh

Rebase brach to master

Update the branch to contain master changes before PR & Merging

git checkout feature/your-branch
git fetch origin/master
git rebase origin/master

Resolve the conflict if it arises and then resume the rebase

4. git rebase origin/master --continue

👍 👍 Always clone from ssh link

👎 git files are case insensitive