记得push
前先pull
,pull的时候注意对比一下有哪些行进行了修改,merge完成后再push。
如果conflict就手动merge
,冲突标志是:
<<<<<<< Updated upstream
...1
=======
...2
>>>>>>> Stashed changes
1部分是之前一个分支的代码,2部分是你的代码。
选择留下哪一部分之后再commit、push,冲突就解决。
233 , git都不会用还敢来github。
大家快点学会它。金坷垃,一袋能顶两袋撒。
home_work for smartphone development
License
czxrrr/haer_lib
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Folders and files
Name | Name | Last commit message | Last commit date | |
---|---|---|---|---|
Repository files navigation
About
home_work for smartphone development
Resources
License
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published