• Select SSH Private key in sourcetree
  • Tools -> Options -> SSH Client Configuration
• Add SSH key in Putty Pageant
• Past public key in Bitbucket setting.

Reference:

https://stackoverflow.com/questions/1783405/how-do-i-check-out-a-remote-git-branch

1. Change line ending config
   
   git config core.autocrlf true

   1	git config core.autocrlf true

2. Change file mode:
   
   // Check current status git config core.filemode // Current folder git config core.filemode false // System level git config --system core.filemode false // Global git config --global core.filemode false

   1 2 3 4 5 6 7 8 9 10 11

   // Check current status git config core.filemode   // Current folder git config core.filemode false   // System level git config --system core.filemode false   // Global git config --global core.filemode false

3. Clear cache
   
   git rm --cached -r .

   1	git rm --cached -r .

Reference:

1. elharony commented on 7 Dec 2018
   https://github.com/microsoft/WSL/issues/184
2. https://github.com/microsoft/WSL/issues/2900

Github solution

Reference:

1. https://docs.github.com/en/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line
2. https://docs.github.com/en/github/using-git/adding-a-remote

https://stackoverflow.com/questions/2432764/how-to-change-the-uri-url-for-a-remote-git-repository

把目前使用中，而且沒有git的資料夾track remote branch

1. 連線的PC or server要有SSH Key, 並且把Public key的內容貼到Bitbucket的Repo設定裡 Step by step tutorial: https://confluence.atlassian.com/bitbucket/set-up-an-ssh-key-728138079.html
   1. ssh-keygen
   2. Press the Enter or Return key to accept the default location. (Or leave it empty)
   3. Enter and re-enter a passphrase when prompted.
   4. ls ~/.ssh id_rsa id_rsa.pub
   5. eval ssh-agent
      eval `ssh-agent`

      1	eval `ssh-agent`

   6. ssh-add ~/.ssh/<private_key_file>
   7. cat ~/.ssh/id_rsa.pub
   8. Paste public key to bitbucket
2. Git commands to track remote branch
   1. git init
   2. git add .
   3. git commit -m ‘Init git’ (Current branch is master)
   4. git remote add origin [email protected]:/opt/git/project.gitReference or
      git branch --set-upstream-to=origin/master master

      1	git branch --set-upstream-to=origin/master master

   5. git fetch
   6. git branch -u origin/master

Fix “detached HEAD” error

https://gitbook.tw/chapters/faq/detached-head.html

Fix “refusing to merge unrelated histories” error:

1. Force pull
   git pull origin master --allow-unrelated-histories

   1	git pull origin master --allow-unrelated-histories

2. Fix conflicts maybe. Uploading files with conflicts by FTP could be the fastest solution.
3. git add .
4. commit
5. Done

Note: 執行完上方command後，兩方client有不同步或是持續出現conflict的問題，重覆修正幾次之後就好了。原因不明。 Reference:

1. https://stackoverflow.com/questions/24916708/track-existing-folder-from-remote-git-repo
2. Track Remote Branch https://stackoverflow.com/questions/520650/make-an-existing-git-branch-track-a-remote-branch
3. Common commands related to remote https://backlog.com/git-tutorial/tw/reference/remote.html

Common

push.default warning

• https://www.jianshu.com/p/e26175b2e916

Ignored files still display in git status?

• Warning! If other users pull this commit, this file will be removed, so remember notify others to backup their files if they need it. e.g. index.php for Codeigniter
• https://stackoverflow.com/questions/1818895/keep-ignored-files-out-of-git-status

Set User Info

Reference:

• Official Doc
  https://git-scm.com/book/zh-tw/v1/Git-%E5%9F%BA%E7%A4%8E-%E5%8F%96%E5%BE%97Git%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6%E5%80%89%E5%BA%AB
• https://www.git-tower.com/learn/git/faq/track-remote-upstream-branch
• https://git-scm.com/book/zh-tw/v1/Git-%E5%9F%BA%E7%A4%8E-%E6%AA%A2%E8%A6%96%E6%8F%90%E4%BA%A4%E7%9A%84%E6%AD%B7%E5%8F%B2%E8%A8%98%E9%8C%84

Change Remote URL

Reference: https://gist.github.com/fokayx/255b228ded2bca1c4f60

Process:

The only thing that worked for me was navigating to C:\Users\USERNAME\AppData\Local\Atlassian\SourceTree and removing the passwd file.

1. If you choose to remember password,, you need to remove password file:
   https://community.atlassian.com/t5/Sourcetree-questions/How-to-update-HTTP-S-credentials-in-sourcetree/qaq-p/297564

Before push:

Reference:

• https://stackoverflow.com/questions/4114095/how-to-revert-a-git-repository-to-a-previous-commit

1. SourceTree accept putty format key file only
2. If your SSH is generated by Git bash, you have to convert it to putty format (.ppk)
   open puttygen.exe -> load private key -> save private key
3. Config SSH in Sourcetree:
   Tools -> Options -> SSH Key

Reference:

1. https://confluence.atlassian.com/sourcetreekb/trust-a-server-s-host-key-when-no-button-is-available-to-trust-it-788731545.html