Master weekly sync #6
Annotations
1 error
Merge Fast Forward Only
Switched to a new branch 'master'
branch 'master' set up to track 'origin/master'.
hint: Diverging branches can't be fast-forwarded, you need to either:
hint:
hint: git merge --no-ff
hint:
hint: or:
hint:
hint: git rebase
hint:
hint: Disable this message with "git config advice.diverging false"
fatal: Not possible to fast-forward, aborting.
|
Loading