GitHub Collaboration, SSH Login, Branching, Merging

The first 10 minutes is a recap on using ssh.

There is a more in-depth video covering installing vagrant from scratch all the way to setting GitHub with ssh, installing betty, adding numbers to Vim and much more. Watch It Here. https://www.youtube.com/watch?v=lse8hX5KCbU.

It should be possible to use personal access token when cloning instead of ssh. You can check out the general syntax for cloning using the personal access token here: https://youtu.be/_YHt0QB4EaE

Some of the codes can be found here.. https://www.itechjungle.com/blog/programming/coding/beginners-vagrant-github-ssh/

TO NOTE:
- when merging we ought to have a commit message. Hence code should be {git merge {branch-to-merge} -m "merge message"}

- branches must be at par with the online repo. Use git fetch to fetch updates. Git fetch gets updates but doesn't;t add them to your local repo.

- use commands like {git log} or {git diff} to inspect the changes that were fetched from the remote repository
-git log will give a log of commits done and by who.
-git diff {branch-name} - will show changes in the files between the current branch and {branch-name}
- then use git pull to add those changes from the online repo to your local repo. it basically merges the local repo with the online repo.
more will be written on the website.

00:00 - Intro
00:55 - 1. Recap connecting to github with ssh
01:22 - 1.1 Creating public and private keys
03:00 - 1.2 Adding public key to github website.
04:45 - 1.3 Adding Private Key to local environment.
05:45 - 1.4 Setting git global identity
07:00 - 1.5 Making private key permanent in local environment
09:00 - 2. Person A creating new repo
10:00 - 3. Adding Person B as a collaborator
11:09 - 4. Person A cloning.
12:38 - 4.1 Person A doing git push.
14:30 - 3.1 Person B accepting Collab request
15:31 - 5 Person B cloning.
16:28 - 6 - Best Collaborating practises.
17:35 - 5.1 - Person B pushing.
18:54 - 5.2 - Visual Process of Person B pushing.
20:03 - 7. Using Branching
20:50 - 7.1 Person A branching and Pushing
23:05 - 7.2 Person B branching and Pushing.
23:50 - 8. Methods of merging
27:40 - 8.1 Person A merging
30:38 - 8.2 Person B Merging
33:00 Conclusion