Hexo + Github的个人博客。。
guochengfeng / guochengfeng.github.io Goto Github PK
View Code? Open in Web Editor NEW个人博客
Home Page: http://guochengfeng.github.io/
个人博客
Home Page: http://guochengfeng.github.io/
这里是干嘛的
由于生产master
和测试分支test
的环境配置文件会存在不同,且两者需要单独独立存在,所以两分支合并时不能将相关文件合并。
比如,同一个配置文件
application.yml
,master
分支使用production
,test
分支使用test
。
merge driver
git config --global merge.ours.driver true
.gitattributes
文件在test
分支上创建.gitattributes
文件,并且在文件中写上不merge
的文件全路径名。
echo 'XXXX/application.yml merge=ours' >> .gitattributes
.gitattributes
git add .gitattributes
git commit -m '合并test分支到master时忽略XXXX/application.yml'
然后就可以在test
分支修改文件了。
merge
避坑:
.gitattribute
生效是有条件的,需要test
分支的XXXX/application.yml
文件修改时间早于master
分支的相同文件修改时间。
所以修改完test
分支的文件后需要切换到master
分支也修改下相同文件,然后再执行merge
操作。
切换到master
,执行merge
:
git merge test
在test
分支上的XXXX/application.yml
就不会被合并了。
A declarative, efficient, and flexible JavaScript library for building user interfaces.
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google ❤️ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.