Git学习

Git分支管理

解决合并冲突

commit changes to current branch
merge release code to local branch by git command
1 git pull origin release/xxx

resolved conflict files
commit all changes to remote-current branch

未提交修改切换分支

git stash -m "test stash"
git stash list
git stash pop

Git项目管理

获取开源项目代码

click "+" of the gitee, choose import repository
paste url and click import
create new branch and set as default branch
clone the source for default brach

新建项目到远程仓库

create new project folder
choose the folder to create project use idea
vcs.import into version control.create git repository
commit the code
set remote repository url when push code