oh-my-git's Introduction
Git is a version control system. Git is free software. Git is a distributed version control system. Git is free software. Today I'm learning how to use version control tool-git. Create a new plain file. <<<<<<< HEAD <<<<<<< HEAD llllll ======= nnnnnn >>>>>>> dev3 "我又回到了master 不会看到dev3对readMe做的修改 但与dev3分支merge时会冲突" "我打算两者的修改都要" "en 我从master上新建了个分支解决dev4的bug回到master合并后又从stash list中恢复我上次被打断的工作" "nice 我完成了主要任务也修复了bug" "我wwwwwwwt" ======= :: ======= "我在master分支dev工作并且修改了另一个伙伴同样的文件没错就是readMe.txt" >>>>>>> fd71c07f2d9406f6fe86991a53d3bb7319c483b3 "同个分支上不同小伙伴提交有冲突" "同一个人不同分支提交有冲突" "有相同点也有不同点对于git pull之后的冲突处理两者是相通的对于首先出现的gitpull失败问题则要现将本地与远程关联后再Git pull" >>>>>>> dev "不管了太多了我一个人模拟多人协作有点搞不清楚道理懂就ok等待公司实战"
oh-my-git's People
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.