跳到主要内容
版本：0.17.0+

git-bugfix

  1. FIXED: Fatal: Not possible to fast-forward, aborting
    1. conclusion
    2. BEST-PRACTICE: git branch/lola
  2. FIXME: git-fls not found
  3. cannot git pull since file path invalid

FIXED: Fatal: Not possible to fast-forward, aborting​

conclusion​


# Step 1: pull rebase
git pull --rebase

# Step 2: modify the conflicting files (Accept local or remote)

# Step 3: add update
git add .

# Step 4. rebase continue
git rebase --continue

# Step 5. push
git push # or TODO: git commit -a; git push

ref:

BEST-PRACTICE: git branch/lola​

# show branches, with graph
glola # alias | grep graph; i.e. `glola='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'\'' --all'`

# show branches, and where is now
git branch

# delete branch
git branch -d XXX

# switch branch
git checkout XXX

FIXME: git-fls not found​

git-lfs filter-process: git-lfs: command not found
fatal: the remote end hung up unexpectedly
brew install git-lfs

cannot git pull since file path invalid​

It is mainly caused by the 系统之间的兼容问题，specific file/folder names are not supported on some platforms, for example the :* and trailing spaces are not supported on Windows platform.

Rename those files are always a good choice, otherwise you need to learn to write a little complicated configurations for git (and rarely used).

ref: