qq_22325259的博客

通过vs的可视化界面，使用git变基

Hint: You have divergent branches and need to specify how to reconcile them.Hint: You can do so by running one of the following commands sometime beforeHint: your next pull:Hint:Hint: git config pull.rebase false # mergeHint: git config pull.reb