git 使用

创建分支

git branch lls 创建本地分支
git push origin lls 加到远程分支
git branch -av 查看分支

/*  master                 66db2bb 12
  remotes/origin/HEAD    -> origin/master
  remotes/origin/develop 4c4f2f8 Initial commit
  remotes/origin/lls     bde69ef 11
  remotes/origin/master  66db2bb 12*/

git checkout -b lls remotes/origin/lls 切换分支并关联
git checkout master //切换分支

//—–设置不同用户
git config –add –local user.name ‘muke’
git config –add –local user.email ‘muke@qq.com‘
git config –local –list

//合并分支
git merge remotes/origin/lls
分支冲突： Automatic merge failed; fix conflicts and then commit the result.
//冲突解决

1.git merge –abort //忽略其他分支的内容
2.手动合并 （git add / git commit /git push）

重置

• git reset --soft HEAD^ //撤回提交
• git config -e 重新配置 用户名、邮箱
• git commit --amend --reset-author //重置提交者

撤销当前目录所有已修改内容

git reset
git checkout .
git clean -fdx

#3 合并最新主干代码
(feature) git checkout master
(master) git pull
(master) git checkout feature
(feature) git merge master

解冲突
(feature) git commit #

www.cnblogs.com/lyc94620/p/9252506...

 set global sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';

laravel软删除 blog.csdn.net/lixing1359199697/art...

git add -u

git commit

git push origin HEAD:refs/for/lls