Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
| git:start [2021/05/18 09:59] – jmerari | git:start [2021/10/19 08:54] (current) – jmerari | ||
|---|---|---|---|
| Line 10: | Line 10: | ||
| ===== Resolving Conflict ===== | ===== Resolving Conflict ===== | ||
| - | to open UI tool, | + | Provided that you already setup the merge tool to your favorite software (Kdiff3 or others) : |
| + | < | ||
| git mergetool | git mergetool | ||
| + | </ | ||
| + | ===== Using Git with SSH Connection ===== | ||
| + | ==== Why use SSH ? ==== | ||
| + | Compare to HTTPS, using SSH is more secure. You never send your username and password accros the network. For a private repository, SSH is much preferred. | ||
| + | ==== Step by Step ==== | ||
| + | 1. Create key pair for your account. Put your email as Comment (CLI option -C) on this key. If you use the same email for Bitbucket, Github, and Gitlab, you can use the same key for all of them. Using different key is more secure. If one key compromised, | ||
| + | < | ||
| + | ssh-keygen -t ed25519 -C " | ||
| + | </ | ||
| + | 2. Go to your account setting menu in bitbucket.org/ | ||
| + | After the new key listed, then you can push/fetch with the command : | ||
| + | < | ||
| + | git push ssh:// | ||
| + | git push ssh:// | ||
| + | </ | ||
| + | |||
| + | https:// | ||