====== Github ======
===== set url and ssh keys to push using ssh =====
<code bash>
ssh-keygen -t rsa -C "your_email@example.com"
cat ~/.ssh/id_rsa.pub
</code>
Copy the content in the SSH keys of your Github profile\\
Test:
<code bash> ssh -T git@github.com</code>

===== push changes =====
in your local copy of the repository:
<code bash>git remote set-url origin git@github.com:username/your-repository.git</code>

Then once you changed something
<code bash>git commit -am "your comment"
git push</code>

===== GIT Merge conflict =====
<code bash>
git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt false
</code>
Navigate using Ctl+W between LOcal BAse REmote \\
or MErge windows displayed like so:
<code>
╔═══════╦══════╦════════╗
║       ║      ║        ║
║ LOCAL ║ BASE ║ REMOTE ║
║       ║      ║        ║
╠═══════╩══════╩════════╣
║                       ║
║        MERGED         ║
║                       ║
╚═══════════════════════╝
</code>
If you want to get changes from REMOTE

<code>:diffg RE  </code>
If you want to get changes from BASE

<code>:diffg BA  </code>
If you want to get changes from LOCAL

<code>:diffg LO </code>
Once the MErged windows looks like what you want\\
Step 5. Save, Exit, Commit and Clean up

<code>:wqa</code> save and exit from vi

<code bash>git commit -m "message"</code>

<code>git clean</code> Remove extra files (e.g. *.orig) created by diff tool.
 


====== Reference ======
  * https://gist.github.com/developius/c81f021eb5c5916013dc
  * https://www.shellhacks.com/git-config-username-password-store-credentials/
  * https://fling.seas.upenn.edu/~giesen/dynamic/wordpress/equivalent-commands-for-git-svn-and-cvs/
  * https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git-repository