<!--
111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111
111111111111111111111111111111111111111111111000011111111111111111111111111111111111111111111
111111111111111111111111111111111111111111100000011111111111111111111111111111111111111111111
111111111111111111111111111111111111111110000001111000110000000000000001111111111111111111111
111111111111111111111111111111110000000000000000000000000000000001111111111111111111111111111
111111111111111111111111111111011100000000000000000000000000001111111111111111111111111111111
111111111111111111111111111111111111100000000000000000000000000000000011111111111111111111111
111111111111111111111111111111111000000000000000000000000000000011111111111111111111111111111
111111111111111111111111111111110001110000000000000000000000000000011111111111111111111111111
111111111111111111111111111110000011000000000001100000000000000000001111111111111111111111111
111111111111111111111111111100000000000000010011110000000000000110000011111111111111111111111
111111111111111111111111000000000000000000111011111000000000000011100001111111111111111111111
111111111111111111111100000000000000000001111111110000000000000001111000111111111111111111111
111111111111111111111000000001111111111111111111110000000000000000111110011111111111111111111
111111111111111111111100000111111111111111111111000000000000000000111111111111111111111111111
111111111111111111111111011111111111111111110000000000000000000000011111111111111111111111111
111111111111111111111111111111000000000000000000000000000000000000011111111111111111111111111
111111111111111111111111111111110000000000000000000000000000110000011111111111111111111111111
111111111111111111111111111100000000000000000000000000000011110000011111111111111111111111111
111111111111111111111111100000000000000000000000000000000111111000011111111111111111111111111
111111111111111111111110000000000000000000000000000000111111111000011111111111111111111111111
111111111111111111111000000000000000000000000000000011111111111000011111111111111111111111111
111111111111111111110000000000000000000111000000111111111111111000111111111111111111111111111
111111111111111111100000000000000001111111111111111111111111111001111111111111111111111111111
111111111111111111000000000000000111111111111111110011111111111111111111111111111111111111111
111111111111111110000000000000001111111111111111111110000111111111111111111111111111111111111
111111111111111110000000000100011111111111111111111111100000111111111111111111111111111111111
111111111111111100000000000110011111111111111111111111111000000011111111111111111111111111111
111111111111111100000000000011101111111111110001111100001110000000111111111111111111111111111
111111111111111100000000000001111111111111111100011111000000000000001111111111111111111111111
111111111111111100000000000000001111111111111100000000000000000000000011111111111111111111111
111111111111111100100000000000000000111111111000000000000000000000000000111111111111111111111
111111111111111110011000000000000111111111000000000000000011100000000000011111111111111111111
111111111111111111011000000000000000000000000000000000011111111111000000001111111111111111111
111111111111111111111000000000000000000000000000000000111111111111110000000111111111111111111
111111111111111111111000001000000000000000000110000000011101111111111000000111111111111111111
111111111111111111111100011111000000000000011111000000000011111111111011000011111111111111111
111111111111111111111000111111110001000000000111110000011111111111111111000011111111111111111
111111111111111111111000111111111111111000000011111110000000011111111111100011111111111111111
111111111111111111111100111111111111111111100000011111111111111111111111110001111111111111111
- ---------------------------------- 神龙保佑，永无BUG ------------------------------------ -
Star me on Gitee - https://gitee.com/yadong.zhang/DBlog
yadong.zhang (yadong.zhang0415#gmail.com)
https://docs.zhyd.me
如有问题请加QQ群(190886500)，备注：dblog
- ---------------------------------- 神龙保佑，永无BUG ------------------------------------ -
-->
<!DOCTYPE HTML>
<html lang="zh-CN">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<title>Simon的博客 | 一个程序员的个人博客</title>
<meta name="author" content="SIMON(582883825@qq.com)">
<meta name="keywords" content="Simon的指尖世界"/>
<meta name="description" content="以文字和视频的形式，不定时的分享，包括编码、应用框架、系统架构及解决方案。" id="meta_description">
<link rel="canonical" href="https://www.v8en.com/type/8" />
<link href="https://www.v8en.com/img/favicon.ico" rel="shortcut icon" type="image/x-icon">
<link href="https://www.v8en.com/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="https://www.v8en.com/css/bootstrap.min.css" rel="stylesheet">
<link href="https://www.v8en.com/css/jquery-confirm.min.css" rel="stylesheet">
<link href="https://www.v8en.com/css/jquery.fancybox.min.css" rel="stylesheet">
<link href="https://www.v8en.com/css/bootstrapValidator.min.css" rel="stylesheet">
<link href="https://www.v8en.com/css/nprogress.min.css" rel="stylesheet">
<link href="https://www.v8en.com/css/zhyd.core.css" rel="stylesheet" type="text/css">
<link href="https://www.v8en.com/css/zhyd.comment.css" rel="stylesheet" type="text/css">
<style type="text/css">
</style>
</head>
<body>
<nav id="topmenu" class="navbar navbar-default navbar-fixed-top">
<div class="menu-box">
<div class="pull-left">
<ul class="list-unstyled list-inline">
<li><span id="currentTime"></span></li>
</ul>
<div class="clear"></div>
</div>
<div class="menu-topmenu-container pull-right">
<ul class="list-unstyled list-inline pull-left">
<li><a href="https://www.v8en.com/about" class="menu_a" title="关于博客" data-toggle="tooltip" data-placement="bottom">关于本站</a></li>
<li><a href="https://www.v8en.com/links" class="menu_a" title="友情链接" data-toggle="tooltip" data-placement="bottom">友情链接</a></li>
</ul>
<ul class="list-unstyled list-inline pull-left">
<li><a href="javascript:;;" data-toggle="modal" data-target="#oauth" rel="nofollow" title="授权登录">登录</a></li>
</ul>
</div>
</div>
</nav>
<div class="modal" id="oauth" tabindex="-1" role="dialog" aria-labelledby="oauthTitle">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<ul class="list-inline">
<li><h4 class="modal-title" id="oauthTitle">登录</h4></li>
<li><a href="javascript:$.alert.info('没用，别点了！我就没打算开发这个功能。Just to show you~~~');"><h4 class="modal-title" id="myModalLabel">注册</h4></a></li>
</ul>
</div>
<div class="modal-body">
<div class="oauth">
<ul class="list-unstyled list-inline oauth-list" style="text-align: center;">
<li>
<a href="https://www.v8en.com/oauth/social/GITHUB" target="">
<img src="https://cdn.jsdelivr.net/gh/justauth/justauth-oauth-logo@1.10/github.png" alt="" class="img-circle">
</a>
</li>
<li>
<a href="https://www.v8en.com/oauth/social/GITEE" target="">
<img src="https://cdn.jsdelivr.net/gh/justauth/justauth-oauth-logo@1.10/gitee.png" alt="" class="img-circle">
</a>
</li>
</ul>
<div class="oauth-line">
<span style="font-size: 12px">
Powered by <a href="https://gitee.com/fujieid/jap" target="_blank">JustAuthPlus(JAP)</a>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<nav id="mainmenu" class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="menu-box">
<div class="navbar-header">
<span class="pull-right nav-search toggle-search" data-toggle="modal" data-target=".nav-search-box"><i class="fa fa-search"></i></span>
<button class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">
<img alt="Brand" src="https://www.v8en.com/img/favicon.ico">Simon的博客
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<div class="pull-left site-desc">
<h1 class="auto-shake"><a href="https://www.v8en.com" data-original-title="指尖世界，学习、实践及分享！！！" data-toggle="tooltip" data-placement="bottom">Simon的博客</a></h1>
<p class="site-description">指尖世界，学习、实践及分享！！！</p>
</div>
<ul class="nav navbar-nav ">
<li>
<a href="/" class="menu_a"><i class="fa fa-home"></i>首页</a>
</li>
<li class="dropdown">
<a href="/type/1" class="menu_a">
<i class="fa fa-share-alt"></i>资源分享 <span class="caret dropdown-toggle" data-toggle="dropdown" aria-expanded="false"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="/type/13" title="点击查看《Mac工具》的文章">Mac工具</a></li>
<li><a href="/type/14" title="点击查看《Mac游戏》的文章">Mac游戏</a></li>
</ul>
</li>
<li class="dropdown">
<a href="/type/2" class="menu_a">
<i class="fa fa-code"></i>编程相关 <span class="caret dropdown-toggle" data-toggle="dropdown" aria-expanded="false"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="/type/20" title="点击查看《编码技巧》的文章">编码技巧</a></li>
<li><a href="/type/18" title="点击查看《测试驱动开发》的文章">测试驱动开发</a></li>
<li><a href="/type/16" title="点击查看《工具及技巧》的文章">工具及技巧</a></li>
<li><a href="/type/10" title="点击查看《开发语言》的文章">开发语言</a></li>
<li><a href="/type/8" title="点击查看《GIT》的文章">GIT</a></li>
</ul>
</li>
<li class="dropdown">
<a href="/type/3" class="menu_a">
<i class="fa fa-envira"></i>应用框架 <span class="caret dropdown-toggle" data-toggle="dropdown" aria-expanded="false"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="/type/15" title="点击查看《Spring》的文章">Spring</a></li>
<li><a href="/type/22" title="点击查看《IntelliJ Platform》的文章">IntelliJ Platform</a></li>
<li><a href="/type/23" title="点击查看《Skywalking》的文章">Skywalking</a></li>
</ul>
</li>
<li class="dropdown">
<a href="/type/4" class="menu_a">
<i class="fa fa-linux"></i>架构相关 <span class="caret dropdown-toggle" data-toggle="dropdown" aria-expanded="false"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="/type/24" title="点击查看《专题分享》的文章">专题分享</a></li>
<li><a href="/type/17" title="点击查看《微服务架构》的文章">微服务架构</a></li>
<li><a href="/type/11" title="点击查看《Nginx》的文章">Nginx</a></li>
<li><a href="/type/9" title="点击查看《Zeebe》的文章">Zeebe</a></li>
</ul>
</li>
<li class="dropdown">
<a href="/type/5" class="menu_a">
<i class="fa fa-diamond"></i>解决方案 <span class="caret dropdown-toggle" data-toggle="dropdown" aria-expanded="false"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="/type/21" title="点击查看《领域驱动设计》的文章">领域驱动设计</a></li>
<li><a href="/type/19" title="点击查看《知识扩展》的文章">知识扩展</a></li>
<li><a href="/type/12" title="点击查看《敏捷管理》的文章">敏捷管理</a></li>
<li><a href="/type/7" title="点击查看《研发管理流程》的文章">研发管理流程</a></li>
<li><a href="/type/6" title="点击查看《DevOps相关》的文章">DevOps相关</a></li>
</ul>
</li>
<li><a href="/guestbook" class="menu_a"><i class="fa fa-comments-o"></i>留言板</a></li>
<li><span class="pull-right nav-search main-search" data-toggle="modal" data-target=".nav-search-box"><i class="fa fa-search"></i></span></li>
</ul>
</div>
</div>
</nav>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?d93e0a6530fcd1c4c338fbe7d11c7f7c";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
<div class="container custome-container">
<div class="ad-mark" id="HOMEPAGE_TOP" style="display: none;margin-bottom: 10px"></div>
<!--[if lt IE 9]><div class="alert alert-danger topframe" role="alert">Oh My God！你的浏览器实在<strong>太太太太太太旧了</strong>，赶紧升级浏览器 <a target="_blank" class="alert-link" href="http://browsehappy.com">立即升级</a></div><![endif]-->
<nav class="breadcrumb">
<div class="notify"><i class="fa fa-bullhorn fa-fw"></i></div>
<div id="scrolldiv">
<div class="scrolltext">
<ul class="list-unstyled" id="notice-box">
<li class="scrolltext-title">
<a href="javascript:void(0)" rel="bookmark">本站正式启用新域名:<a href="https:/www.zhyd.me" target="_blank"><strong>https:/www.zhyd.me</strong></a></a>
</li>
<li class="scrolltext-title">
<a href="javascript:void(0)" rel="bookmark">活了二十多年，没能为祖国、为人民做点什么，每思及此，伤心欲绝。</a>
</li>
<li class="scrolltext-title">
<a href="javascript:void(0)" rel="bookmark">其实我们可以将所有的问题归结为两种：一种是没饭吃饿出来的；一种是吃饱了撑出来的。</a>
</li>
</ul>
</div>
</div>
</nav>
<div class="row">
<div class="col-sm-8 blog-main">
<article class="fade-in">
<figure class="thumbnail">
<a href="https://www.v8en.com/article/164">
<img width="150" height="150" src="https://upload.v8en.com/oneblog/20190910012607450.jpg" onerror="this.src='https://www.v8en.com/img/default.png'" class="img-responsive lazy-img" alt="Git专题第六章：时光机穿梭（5）- 删除文件">
</a>
</figure>
<header class="entry-header">
<span class="art art-original"><i class="fa fa-check fa-fw"></i>原创</span>
<span class="art art-type"><a href="https://www.v8en.com/type/8"><i class=" fa-fw"></i> GIT</a></span>
<h2 class="entry-title">
<a href="https://www.v8en.com/article/164" rel="bookmark" title="Git专题第六章：时光机穿梭（5）- 删除文件" data-toggle="tooltip" data-placement="bottom">Git专题第六章：时光机穿梭（5）- 删除文件</a>
</h2>
</header>
<div class="entry-content">
<div class="archive-content">
Git专题课程
</div>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>2019-09-19</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(1,629)</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="https://www.v8en.com/article/164#comment-box" rel="external nofollow">
<i class="fa fa-comments-o fa-fw"></i>评论(0)
</a>
</span>
</span>
<div class="clear"></div>
<span class="entry-more">
<a href="https://www.v8en.com/article/164" rel="bookmark" title="点击查看文章详情" data-toggle="tooltip" data-placement="bottom">阅读全文</a>
</span>
</div>
</article>
<article class="fade-in">
<figure class="thumbnail">
<a href="https://www.v8en.com/article/163">
<img width="150" height="150" src="https://upload.v8en.com/oneblog/20190910012607450.jpg" onerror="this.src='https://www.v8en.com/img/default.png'" class="img-responsive lazy-img" alt="Git专题第六章：时光机穿梭（4）- 管理修改">
</a>
</figure>
<header class="entry-header">
<span class="art art-original"><i class="fa fa-check fa-fw"></i>原创</span>
<span class="art art-type"><a href="https://www.v8en.com/type/8"><i class=" fa-fw"></i> GIT</a></span>
<h2 class="entry-title">
<a href="https://www.v8en.com/article/163" rel="bookmark" title="Git专题第六章：时光机穿梭（4）- 管理修改" data-toggle="tooltip" data-placement="bottom">Git专题第六章：时光机穿梭（4）- 管理修改</a>
</h2>
</header>
<div class="entry-content">
<div class="archive-content">
Git专题教程
</div>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>2019-09-19</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(1,463)</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="https://www.v8en.com/article/163#comment-box" rel="external nofollow">
<i class="fa fa-comments-o fa-fw"></i>评论(0)
</a>
</span>
</span>
<div class="clear"></div>
<span class="entry-more">
<a href="https://www.v8en.com/article/163" rel="bookmark" title="点击查看文章详情" data-toggle="tooltip" data-placement="bottom">阅读全文</a>
</span>
</div>
</article>
<article class="fade-in">
<figure class="thumbnail">
<a href="https://www.v8en.com/article/162">
<img width="150" height="150" src="https://upload.v8en.com/oneblog/20190910012607450.jpg" onerror="this.src='https://www.v8en.com/img/default.png'" class="img-responsive lazy-img" alt="Git专题第六章：时光机穿梭（3）- 工作区和暂存区">
</a>
</figure>
<header class="entry-header">
<span class="art art-original"><i class="fa fa-check fa-fw"></i>原创</span>
<span class="art art-type"><a href="https://www.v8en.com/type/8"><i class=" fa-fw"></i> GIT</a></span>
<h2 class="entry-title">
<a href="https://www.v8en.com/article/162" rel="bookmark" title="Git专题第六章：时光机穿梭（3）- 工作区和暂存区" data-toggle="tooltip" data-placement="bottom">Git专题第六章：时光机穿梭（3）- 工作区和暂存区</a>
</h2>
</header>
<div class="entry-content">
<div class="archive-content">
Git专题教程
</div>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>2019-09-19</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(1,382)</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="https://www.v8en.com/article/162#comment-box" rel="external nofollow">
<i class="fa fa-comments-o fa-fw"></i>评论(0)
</a>
</span>
</span>
<div class="clear"></div>
<span class="entry-more">
<a href="https://www.v8en.com/article/162" rel="bookmark" title="点击查看文章详情" data-toggle="tooltip" data-placement="bottom">阅读全文</a>
</span>
</div>
</article>
<article class="fade-in">
<figure class="thumbnail">
<a href="https://www.v8en.com/article/161">
<img width="150" height="150" src="https://upload.v8en.com/oneblog/20190910012607450.jpg" onerror="this.src='https://www.v8en.com/img/default.png'" class="img-responsive lazy-img" alt="Git专题第六章：时光机穿梭（2）- 撤销修改">
</a>
</figure>
<header class="entry-header">
<span class="art art-original"><i class="fa fa-check fa-fw"></i>原创</span>
<span class="art art-type"><a href="https://www.v8en.com/type/8"><i class=" fa-fw"></i> GIT</a></span>
<h2 class="entry-title">
<a href="https://www.v8en.com/article/161" rel="bookmark" title="Git专题第六章：时光机穿梭（2）- 撤销修改" data-toggle="tooltip" data-placement="bottom">Git专题第六章：时光机穿梭（2）- 撤销修改</a>
</h2>
</header>
<div class="entry-content">
<div class="archive-content">
Git专题教程
</div>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>2019-09-19</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(1,423)</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="https://www.v8en.com/article/161#comment-box" rel="external nofollow">
<i class="fa fa-comments-o fa-fw"></i>评论(0)
</a>
</span>
</span>
<div class="clear"></div>
<span class="entry-more">
<a href="https://www.v8en.com/article/161" rel="bookmark" title="点击查看文章详情" data-toggle="tooltip" data-placement="bottom">阅读全文</a>
</span>
</div>
</article>
<article class="fade-in">
<figure class="thumbnail">
<a href="https://www.v8en.com/article/160">
<img width="150" height="150" src="https://upload.v8en.com/oneblog/20190910012607450.jpg" onerror="this.src='https://www.v8en.com/img/default.png'" class="img-responsive lazy-img" alt="Git专题第六章：时光机穿梭（1）- 版本回退">
</a>
</figure>
<header class="entry-header">
<span class="art art-original"><i class="fa fa-check fa-fw"></i>原创</span>
<span class="art art-type"><a href="https://www.v8en.com/type/8"><i class=" fa-fw"></i> GIT</a></span>
<h2 class="entry-title">
<a href="https://www.v8en.com/article/160" rel="bookmark" title="Git专题第六章：时光机穿梭（1）- 版本回退" data-toggle="tooltip" data-placement="bottom">Git专题第六章：时光机穿梭（1）- 版本回退</a>
</h2>
</header>
<div class="entry-content">
<div class="archive-content">
Git专题教程
</div>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>2019-09-19</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(1,781)</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="https://www.v8en.com/article/160#comment-box" rel="external nofollow">
<i class="fa fa-comments-o fa-fw"></i>评论(0)
</a>
</span>
</span>
<div class="clear"></div>
<span class="entry-more">
<a href="https://www.v8en.com/article/160" rel="bookmark" title="点击查看文章详情" data-toggle="tooltip" data-placement="bottom">阅读全文</a>
</span>
</div>
</article>
<article class="fade-in">
<figure class="thumbnail">
<a href="https://www.v8en.com/article/159">
<img width="150" height="150" src="https://upload.v8en.com/oneblog/20190910012607450.jpg" onerror="this.src='https://www.v8en.com/img/default.png'" class="img-responsive lazy-img" alt="Git专题第六章：时光机穿梭（序言）">
</a>
</figure>
<header class="entry-header">
<span class="art art-original"><i class="fa fa-check fa-fw"></i>原创</span>
<span class="art art-type"><a href="https://www.v8en.com/type/8"><i class=" fa-fw"></i> GIT</a></span>
<h2 class="entry-title">
<a href="https://www.v8en.com/article/159" rel="bookmark" title="Git专题第六章：时光机穿梭（序言）" data-toggle="tooltip" data-placement="bottom">Git专题第六章：时光机穿梭（序言）</a>
</h2>
</header>
<div class="entry-content">
<div class="archive-content">
Git专题教程
</div>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>2019-09-19</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(1,947)</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="https://www.v8en.com/article/159#comment-box" rel="external nofollow">
<i class="fa fa-comments-o fa-fw"></i>评论(0)
</a>
</span>
</span>
<div class="clear"></div>
<span class="entry-more">
<a href="https://www.v8en.com/article/159" rel="bookmark" title="点击查看文章详情" data-toggle="tooltip" data-placement="bottom">阅读全文</a>
</span>
</div>
</article>
<article class="fade-in">
<figure class="thumbnail">
<a href="https://www.v8en.com/article/155">
<img width="150" height="150" src="https://upload.v8en.com/oneblog/20190910012607450.jpg" onerror="this.src='https://www.v8en.com/img/default.png'" class="img-responsive lazy-img" alt="Git专题第五章：分支管理-（7）解决冲突">
</a>
</figure>
<header class="entry-header">
<span class="art art-original-0"><i class="fa fa-reply fa-fw"></i>转载</span>
<span class="art art-type"><a href="https://www.v8en.com/type/8"><i class=" fa-fw"></i> GIT</a></span>
<h2 class="entry-title">
<a href="https://www.v8en.com/article/155" rel="bookmark" title="Git专题第五章：分支管理-（7）解决冲突" data-toggle="tooltip" data-placement="bottom">Git专题第五章：分支管理-（7）解决冲突</a>
</h2>
</header>
<div class="entry-content">
<div class="archive-content">
Git专题教程
</div>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>2019-09-17</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(1,522)</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="https://www.v8en.com/article/155#comment-box" rel="external nofollow">
<i class="fa fa-comments-o fa-fw"></i>评论(0)
</a>
</span>
</span>
<div class="clear"></div>
<span class="entry-more">
<a href="https://www.v8en.com/article/155" rel="bookmark" title="点击查看文章详情" data-toggle="tooltip" data-placement="bottom">阅读全文</a>
</span>
</div>
</article>
<article class="fade-in">
<figure class="thumbnail">
<a href="https://www.v8en.com/article/154">
<img width="150" height="150" src="https://upload.v8en.com/oneblog/20190910012607450.jpg" onerror="this.src='https://www.v8en.com/img/default.png'" class="img-responsive lazy-img" alt="Git专题第五章：分支管理-（6）分支管理策略">
</a>
</figure>
<header class="entry-header">
<span class="art art-original-0"><i class="fa fa-reply fa-fw"></i>转载</span>
<span class="art art-type"><a href="https://www.v8en.com/type/8"><i class=" fa-fw"></i> GIT</a></span>
<h2 class="entry-title">
<a href="https://www.v8en.com/article/154" rel="bookmark" title="Git专题第五章：分支管理-（6）分支管理策略" data-toggle="tooltip" data-placement="bottom">Git专题第五章：分支管理-（6）分支管理策略</a>
</h2>
</header>
<div class="entry-content">
<div class="archive-content">
Git专题教程
</div>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>2019-09-17</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(1,538)</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="https://www.v8en.com/article/154#comment-box" rel="external nofollow">
<i class="fa fa-comments-o fa-fw"></i>评论(0)
</a>
</span>
</span>
<div class="clear"></div>
<span class="entry-more">
<a href="https://www.v8en.com/article/154" rel="bookmark" title="点击查看文章详情" data-toggle="tooltip" data-placement="bottom">阅读全文</a>
</span>
</div>
</article>
<article class="fade-in">
<figure class="thumbnail">
<a href="https://www.v8en.com/article/153">
<img width="150" height="150" src="https://upload.v8en.com/oneblog/20190910012607450.jpg" onerror="this.src='https://www.v8en.com/img/default.png'" class="img-responsive lazy-img" alt="Git专题第五章：分支管理-（5）多人协作">
</a>
</figure>
<header class="entry-header">
<span class="art art-original-0"><i class="fa fa-reply fa-fw"></i>转载</span>
<span class="art art-type"><a href="https://www.v8en.com/type/8"><i class=" fa-fw"></i> GIT</a></span>
<h2 class="entry-title">
<a href="https://www.v8en.com/article/153" rel="bookmark" title="Git专题第五章：分支管理-（5）多人协作" data-toggle="tooltip" data-placement="bottom">Git专题第五章：分支管理-（5）多人协作</a>
</h2>
</header>
<div class="entry-content">
<div class="archive-content">
Git专题教程
</div>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>2019-09-17</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(1,551)</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="https://www.v8en.com/article/153#comment-box" rel="external nofollow">
<i class="fa fa-comments-o fa-fw"></i>评论(0)
</a>
</span>
</span>
<div class="clear"></div>
<span class="entry-more">
<a href="https://www.v8en.com/article/153" rel="bookmark" title="点击查看文章详情" data-toggle="tooltip" data-placement="bottom">阅读全文</a>
</span>
</div>
</article>
<article class="fade-in">
<figure class="thumbnail">
<a href="https://www.v8en.com/article/152">
<img width="150" height="150" src="https://upload.v8en.com/oneblog/20190910012607450.jpg" onerror="this.src='https://www.v8en.com/img/default.png'" class="img-responsive lazy-img" alt="Git专题第五章：分支管理-（4）创建与合并分支">
</a>
</figure>
<header class="entry-header">
<span class="art art-original-0"><i class="fa fa-reply fa-fw"></i>转载</span>
<span class="art art-type"><a href="https://www.v8en.com/type/8"><i class=" fa-fw"></i> GIT</a></span>
<h2 class="entry-title">
<a href="https://www.v8en.com/article/152" rel="bookmark" title="Git专题第五章：分支管理-（4）创建与合并分支" data-toggle="tooltip" data-placement="bottom">Git专题第五章：分支管理-（4）创建与合并分支</a>
</h2>
</header>
<div class="entry-content">
<div class="archive-content">
Git专题教程
</div>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>2019-09-17</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(1,604)</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="https://www.v8en.com/article/152#comment-box" rel="external nofollow">
<i class="fa fa-comments-o fa-fw"></i>评论(0)
</a>
</span>
</span>
<div class="clear"></div>
<span class="entry-more">
<a href="https://www.v8en.com/article/152" rel="bookmark" title="点击查看文章详情" data-toggle="tooltip" data-placement="bottom">阅读全文</a>
</span>
</div>
</article>
<nav class="pagination"
data-url="https://www.v8en.com/type/8"
data-search="false"
data-total-page="2"
data-current-page="1"
data-pre="0"
data-next="2"></nav>
</div>
<div class="col-sm-3 blog-sidebar">
<div class="ad-mark" id="SIDEBAR_TOP" style="display: none"></div>
<div class="sidebar-module" style="position: relative;">
<h5 class="custom-title"><i class="fa fa-home fa-fw icon"></i><strong>关于我</strong><small></small></h5>
<div class="widget">
<div id="feed_widget">
<div class="feed-about">
<div class="about-main">
<div class="about-img"><a href="https://upload.v8en.com/oneblog/20220629220439067.png" class="showImage" title="微信公众号"><img src="https://upload.v8en.com/oneblog/20220629220439067.png" alt="微信公众号"></a></div>
<div class="about-name">Simon的博客</div>
<div class="about-the">指尖世界，学习、实践及分享！！！</div>
</div>
<div class="clear"></div>
<!-- 方案一：图标展示 -->
<ul class="widget-icon">
<li class="weixin auto-shake" data-container="body"
data-toggle="popover" data-trigger="hover" data-placement="bottom" data-html="true" data-content="<img src='https://upload.v8en.com/oneblog/20220629220439067.png' style='width: 130px;' alt='QR Code'>">
<a class="tag-icon" title="微信" rel="external nofollow"><i class="fa fa-weixin"></i></a>
</li>
<li class="tqq auto-shake">
<a class="tag-icon" href="javascript:window.open('tencent://message/?uin=582883825&Site=www.www.v8en.com&Menu=yes')" title="点击QQ联系我" target="blank" rel="external nofollow"><i class="fa fa-qq"></i></a>
</li>
<li class="tsina auto-shake">
<a class="tag-icon" href="" title="点击查看我的微博" target="_blank" rel="external nofollow"><i class="fa fa-weibo"></i></a>
</li>
<li class="github auto-shake">
<a class="tag-icon" href="" title="点击查看我的github" target="_blank" rel="external nofollow"><i class="fa fa-github"></i></a>
</li>
</ul>
<!-- 方案二：列表展示 -->
</div>
</div>
</div>
</div>
<div class="sidebar-module article-module hide" style="top: 0;">
<h5 class="custom-title"><i class="fa fa-book fa-fw icon"></i><strong>本文目录</strong><i class="fa fa-close pull-right close-article-menu hide pointer"></i><small></small></h5>
<div id="article-menu" style="overflow:auto">
<ul class="list-unstyled"></ul>
</div>
</div>
<div class="sidebar-module">
<h5 class="custom-title"><i class="fa fa-tags fa-fw icon"></i><strong>标签云</strong><small></small></h5>
<a style="font-size: 10.14px;margin: 5px;" href="https://www.v8en.com/tag/1" title="Linux" data-toggle="tooltip" data-placement="bottom">
Linux
</a>
<a style="font-size: 14.14px;margin: 5px;" href="https://www.v8en.com/tag/2" title="Java" data-toggle="tooltip" data-placement="bottom">
Java
</a>
<a style="font-size: 11.66px;margin: 5px;" href="https://www.v8en.com/tag/3" title="Spring" data-toggle="tooltip" data-placement="bottom">
Spring
</a>
<a style="font-size: 10.42px;margin: 5px;" href="https://www.v8en.com/tag/4" title="Spring Boot" data-toggle="tooltip" data-placement="bottom">
Spring Boot
</a>
<a style="font-size: 14.29px;margin: 5px;" href="https://www.v8en.com/tag/5" title="其他" data-toggle="tooltip" data-placement="bottom">
其他
</a>
<a style="font-size: 14px;margin: 5px;" href="https://www.v8en.com/tag/6" title="Spring Cloud" data-toggle="tooltip" data-placement="bottom">
Spring Cloud
</a>
<a style="font-size: 12.03px;margin: 5px;" href="https://www.v8en.com/tag/7" title="DevOps" data-toggle="tooltip" data-placement="bottom">
DevOps
</a>
<a style="font-size: 14.52px;margin: 5px;" href="https://www.v8en.com/tag/8" title="视频" data-toggle="tooltip" data-placement="bottom">
视频
</a>
<a style="font-size: 15.53px;margin: 5px;" href="https://www.v8en.com/tag/9" title="Coding" data-toggle="tooltip" data-placement="bottom">
Coding
</a>
<a style="font-size: 10.22px;margin: 5px;" href="https://www.v8en.com/tag/10" title="Docker" data-toggle="tooltip" data-placement="bottom">
Docker
</a>
<a style="font-size: 10.19px;margin: 5px;" href="https://www.v8en.com/tag/11" title="SSL/TLS" data-toggle="tooltip" data-placement="bottom">
SSL/TLS
</a>
<a style="font-size: 11px;margin: 5px;" href="https://www.v8en.com/tag/12" title="CDN" data-toggle="tooltip" data-placement="bottom">
CDN
</a>
<a style="font-size: 15.27px;margin: 5px;" href="https://www.v8en.com/tag/13" title="抓包" data-toggle="tooltip" data-placement="bottom">
抓包
</a>
<a style="font-size: 14.56px;margin: 5px;" href="https://www.v8en.com/tag/14" title="Fiddler" data-toggle="tooltip" data-placement="bottom">
Fiddler
</a>
<a style="font-size: 14.36px;margin: 5px;" href="https://www.v8en.com/tag/15" title="Charles" data-toggle="tooltip" data-placement="bottom">
Charles
</a>
<a style="font-size: 11.65px;margin: 5px;" href="https://www.v8en.com/tag/16" title="单元测试" data-toggle="tooltip" data-placement="bottom">
单元测试
</a>
<a style="font-size: 11.04px;margin: 5px;" href="https://www.v8en.com/tag/17" title="TDD" data-toggle="tooltip" data-placement="bottom">
TDD
</a>
<a style="font-size: 15.21px;margin: 5px;" href="https://www.v8en.com/tag/18" title="Mockito" data-toggle="tooltip" data-placement="bottom">
Mockito
</a>
<a style="font-size: 10.29px;margin: 5px;" href="https://www.v8en.com/tag/19" title="Jmeter" data-toggle="tooltip" data-placement="bottom">
Jmeter
</a>
<a style="font-size: 14.54px;margin: 5px;" href="https://www.v8en.com/tag/20" title="Cloud" data-toggle="tooltip" data-placement="bottom">
Cloud
</a>
<a style="font-size: 12.3px;margin: 5px;" href="https://www.v8en.com/tag/21" title="Programming" data-toggle="tooltip" data-placement="bottom">
Programming
</a>
<a style="font-size: 11.78px;margin: 5px;" href="https://www.v8en.com/tag/22" title="lombok" data-toggle="tooltip" data-placement="bottom">
lombok
</a>
<a style="font-size: 15.68px;margin: 5px;" href="https://www.v8en.com/tag/23" title="Security" data-toggle="tooltip" data-placement="bottom">
Security
</a>
<a style="font-size: 11.51px;margin: 5px;" href="https://www.v8en.com/tag/24" title="Keycloak" data-toggle="tooltip" data-placement="bottom">
Keycloak
</a>
<a style="font-size: 12.89px;margin: 5px;" href="https://www.v8en.com/tag/25" title="OAuth" data-toggle="tooltip" data-placement="bottom">
OAuth
</a>
<a style="font-size: 12.11px;margin: 5px;" href="https://www.v8en.com/tag/26" title="OpenID" data-toggle="tooltip" data-placement="bottom">
OpenID
</a>
<a style="font-size: 14.37px;margin: 5px;" href="https://www.v8en.com/tag/27" title="Swagger" data-toggle="tooltip" data-placement="bottom">
Swagger
</a>
<a style="font-size: 11.93px;margin: 5px;" href="https://www.v8en.com/tag/28" title="Testing" data-toggle="tooltip" data-placement="bottom">
Testing
</a>
<a style="font-size: 11.24px;margin: 5px;" href="https://www.v8en.com/tag/29" title="skywalking" data-toggle="tooltip" data-placement="bottom">
skywalking
</a>
<a style="font-size: 15.37px;margin: 5px;" href="https://www.v8en.com/tag/30" title="面试" data-toggle="tooltip" data-placement="bottom">
面试
</a>
<a style="font-size: 15.4px;margin: 5px;" href="https://www.v8en.com/tag/31" title="Nginx" data-toggle="tooltip" data-placement="bottom">
Nginx
</a>
<a style="font-size: 11.84px;margin: 5px;" href="https://www.v8en.com/tag/32" title="LVS" data-toggle="tooltip" data-placement="bottom">
LVS
</a>
<a style="font-size: 14.64px;margin: 5px;" href="https://www.v8en.com/tag/33" title="HAProxy" data-toggle="tooltip" data-placement="bottom">
HAProxy
</a>
<a style="font-size: 11.62px;margin: 5px;" href="https://www.v8en.com/tag/34" title="Keepalived" data-toggle="tooltip" data-placement="bottom">
Keepalived
</a>
<a style="font-size: 15.64px;margin: 5px;" href="https://www.v8en.com/tag/35" title="面向对象" data-toggle="tooltip" data-placement="bottom">
面向对象
</a>
<a style="font-size: 10.83px;margin: 5px;" href="https://www.v8en.com/tag/36" title="设计" data-toggle="tooltip" data-placement="bottom">
设计
</a>
<a style="font-size: 15.5px;margin: 5px;" href="https://www.v8en.com/tag/37" title="UML" data-toggle="tooltip" data-placement="bottom">
UML
</a>
<a style="font-size: 10.33px;margin: 5px;" href="https://www.v8en.com/tag/38" title="设计模式" data-toggle="tooltip" data-placement="bottom">
设计模式
</a>
<a style="font-size: 10.27px;margin: 5px;" href="https://www.v8en.com/tag/39" title="架构师" data-toggle="tooltip" data-placement="bottom">
架构师
</a>
<a style="font-size: 14.06px;margin: 5px;" href="https://www.v8en.com/tag/40" title="课程" data-toggle="tooltip" data-placement="bottom">
课程
</a>
<a style="font-size: 10.87px;margin: 5px;" href="https://www.v8en.com/tag/41" title="IDEA插件" data-toggle="tooltip" data-placement="bottom">
IDEA插件
</a>
<a style="font-size: 10.51px;margin: 5px;" href="https://www.v8en.com/tag/42" title="JVM" data-toggle="tooltip" data-placement="bottom">
JVM
</a>
<a style="font-size: 11.85px;margin: 5px;" href="https://www.v8en.com/tag/43" title="调优实战" data-toggle="tooltip" data-placement="bottom">
调优实战
</a>
<a style="font-size: 11.74px;margin: 5px;" href="https://www.v8en.com/tag/44" title="理论基础" data-toggle="tooltip" data-placement="bottom">
理论基础
</a>
<a style="font-size: 14.97px;margin: 5px;" href="https://www.v8en.com/tag/45" title="Python" data-toggle="tooltip" data-placement="bottom">
Python
</a>
<a style="font-size: 12.78px;margin: 5px;" href="https://www.v8en.com/tag/46" title="GO" data-toggle="tooltip" data-placement="bottom">
GO
</a>
<a style="font-size: 10.57px;margin: 5px;" href="https://www.v8en.com/tag/47" title="zeebe" data-toggle="tooltip" data-placement="bottom">
zeebe
</a>
</div>
<div class="sidebar-module">
<ul class="nav nav-tabs sidebar-tabs" role="tablist">
<li role="presentation" class="active"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab"><i class="fa fa-list"></i>近期文章</a></li>
<li role="presentation"><a href="#home" aria-controls="home" role="tab" data-toggle="tab"><i class="fa fa-thumbs-o-up"></i>站长推荐</a></li>
<li role="presentation"><a href="#messages" aria-controls="messages" role="tab" data-toggle="tab"><i class="fa fa-hand-peace-o"></i>随机文章</a></li>
</ul>
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="profile">
<ol class="list-unstyled">
<li>
<a href="https://www.v8en.com/article/336" title="系统架构系列课程" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> 系统架构系列课程
</a>
</li>
<li>
<a href="https://www.v8en.com/article/335" title="Zeebe官方文档翻译（早期版本：0.26版本）" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> Zeebe官方文档翻译（早期版本：0.26版本）
</a>
</li>
<li>
<a href="https://www.v8en.com/article/334" title="JVM实战专题课程" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> JVM实战专题课程
</a>
</li>
<li>
<a href="https://www.v8en.com/article/333" title="JVM实战（4）——理论基础篇: Minor、Major 和 Full GC" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> JVM实战（4）——理论基础篇: Minor、Major 和 Full GC
</a>
</li>
<li>
<a href="https://www.v8en.com/article/332" title="Go开发问题及解答" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> Go开发问题及解答
</a>
</li>
<li>
<a href="https://www.v8en.com/article/330" title="JVM实战（6）——工具篇: 命令行工具" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> JVM实战（6）——工具篇: 命令行工具
</a>
</li>
<li>
<a href="https://www.v8en.com/article/329" title="JVM实战（5）——理论基础篇: JVM参数" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> JVM实战（5）——理论基础篇: JVM参数
</a>
</li>
<li>
<a href="https://www.v8en.com/article/328" title="JVM实战（3）——理论基础篇: 垃圾回收器" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> JVM实战（3）——理论基础篇: 垃圾回收器
</a>
</li>
<li>
<a href="https://www.v8en.com/article/327" title="JVM实战（2）——理论基础篇：垃圾回收（Garbage Collection）" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> JVM实战（2）——理论基础篇：垃圾回收（Garbage Collection）
</a>
</li>
<li>
<a href="https://www.v8en.com/article/326" title="Java生态系统（第一部分）：理解JVM架构" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> Java生态系统（第一部分）：理解JVM架构
</a>
</li>
</ol>
</div>
<div role="tabpanel" class="tab-pane" id="home">
<ol class="list-unstyled">
<li class="empty-list">
<i class="fa fa-bookmark-o fa-fw"></i> 暂无相关文章
</li>
</ol>
</div>
<div role="tabpanel" class="tab-pane" id="messages">
<ol class="list-unstyled">
<li>
<a href="https://www.v8en.com/article/167" title="A Quick Guide To User-Managed Access 2.0" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> A Quick Guide To User-Managed Access 2.0
</a>
</li>
<li>
<a href="https://www.v8en.com/article/7" title="基于DevOps平台构建自己博客：5-Coding平台提供的能力介绍" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> 基于DevOps平台构建自己博客：5-Coding平台提供的能力介绍
</a>
</li>
<li>
<a href="https://www.v8en.com/article/332" title="Go开发问题及解答" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> Go开发问题及解答
</a>
</li>
<li>
<a href="https://www.v8en.com/article/144" title="Nginx教程第四章：Nginx 配置指令的执行顺序（五）" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> Nginx教程第四章：Nginx 配置指令的执行顺序（五）
</a>
</li>
<li>
<a href="https://www.v8en.com/article/229" title="JAVA8系列教程-forEach" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> JAVA8系列教程-forEach
</a>
</li>
<li>
<a href="https://www.v8en.com/article/309" title="模版方法模式（Template Pattern）" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> 模版方法模式（Template Pattern）
</a>
</li>
<li>
<a href="https://www.v8en.com/article/258" title="JAVA8系列教程-使用Pattern.compile()方法时，正则表达式作为谓词" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> JAVA8系列教程-使用Pattern.compile()方法时，正则表达式作为谓词
</a>
</li>
<li>
<a href="https://www.v8en.com/article/116" title="模拟人生4整合版（For Mac）" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> 模拟人生4整合版（For Mac）
</a>
</li>
<li>
<a href="https://www.v8en.com/article/155" title="Git专题第五章：分支管理-（7）解决冲突" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> Git专题第五章：分支管理-（7）解决冲突
</a>
</li>
<li>
<a href="https://www.v8en.com/article/314" title="状态模式（State Pattern）" data-toggle="tooltip" data-placement="bottom">
<i class="fa fa-book fa-fw"></i> 状态模式（State Pattern）
</a>
</li>
</ol>
</div>
</div>
</div>
<div class="clear"></div>
<div class="sidebar-module">
<h5 class="custom-title"><i class="fa fa-info fa-fw icon"></i><strong>网站信息</strong><small></small></h5>
<ul class="ul-default site-info">
<li> <i class="fa fa-file fa-fw"></i> 文章总数：203 篇</li>
<li> <i class="fa fa-tags fa-fw"></i> 标签总数：47 个</li>
<li> <i class="fa fa-folder-open fa-fw"></i> 分类总数：24 个</li>
<li> <i class="fa fa-comments fa-fw"></i> 留言数量：0 条</li>
<li> <i class="fa fa-users fa-fw"></i> 在线人数：<span class="online">1</span>人</li>
<li> <i class="fa fa-calendar fa-fw"></i> 运行天数：1,057天</li>
<li> <i class="fa fa-pencil-square fa-fw"></i> 最后更新：2022年06月20日16点</li>
<li> <i class="fa fa-vine fa-fw"></i> 系统版本：<a href="https://gitee.com/yadong.zhang/DBlog/releases/v2.3.4" rel="nofollow" target="_blank" style="color: #4286ca;font-weight: 600;">v2.3.4</a></li>
</ul>
</div>
<div class="ad-mark" id="SIDEBAR_BOTTOM" style="display: none"></div>
</div>
</div>
</div>
<div id="HOMEPAGE_OPEN_SCREEN" style="display: none" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true" data-keyboard="false">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">站长力荐<i class="fa fa-fire red"></i></h4>
</div>
<div class="modal-body ad-mark" id="ad-body">
</div>
</div>
</div>
</div>
<div class="modal fade nav-search-box" tabindex="-1" role="dialog" aria-labelledby="navSearchModalLabel">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header" style="padding: 5px 15px;">
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-top: 10px;"><span aria-hidden="true">&times;</span></button>
<h4><i class="fa fa-search"></i> 搜索文章</h4>
</div>
<div class="modal-body">
<form action="/" method="post" class="form-horizontal searchForm" id="searchForm">
<input type="hidden" name="pageNumber" value="1">
<div class="input-group bottom-line">
<input type="text" class="form-control br-none" name="keywords" value="" required="required" placeholder="输入搜索内容">
<span class="input-group-btn">
<button class="btn btn-default br-none nav-search-btn pointer" type="submit"><i class="fa fa-search"></i> 搜索</button>
</span>
</div>
<div class="clear"></div>
<ul class="list-unstyled list-inline search-hot">
<li><strong style="position: relative;top: 2px;color: #999999;">热门搜索：</strong></li>
<li><a class="pointer" rel="external nofollow"><span class="label label-info">Java</span></a></li>
<li><a class="pointer" rel="external nofollow"><span class="label label-info">SpringBoot</span></a></li>
</ul>
</form>
</div>
</div>
</div>
</div>
<!--评论弹框-->
<div class="modal fade bs-example-modal-sm" id="comment-detail-modal" tabindex="-1" role="dialog" aria-labelledby="comment-detail-modal-label">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="comment-detail-modal-label">评论信息框</h4>
<small><i class="fa fa-lightbulb-o fa-fw"></i>可以通过QQ号实时获取昵称和头像</small>
</div>
<div class="modal-body">
<form id="detail-form">
<input type="hidden" name="avatar">
<div class="form-group input-logo">
<input type="text" class="form-control" name="qq" placeholder="选填" value="">
<img class="pull-left hide" alt="">
<span class="fa fa-qq pull-left" aria-hidden="true">QQ</span>
</div>
<div class="form-group input-logo">
<input type="text" class="form-control" name="nickname" placeholder="必填" value="匿名">
<span class="fa fa-user pull-left" aria-hidden="true">昵称</span>
</div>
<div class="form-group input-logo">
<input type="text" class="form-control" name="email" placeholder="选填">
<span class="fa fa-envelope pull-left" aria-hidden="true">邮箱</span>
</div>
<div class="form-group input-logo">
<input type="text" class="form-control" name="url" placeholder="选填">
<span class="fa fa-globe pull-left" aria-hidden="true">网址</span>
</div>
<div class="form-group">
<button type="button" class="btn btn-default btn-sm" id="detail-form-btn"><i class="fa fa-smile-o"></i>提交评论</button>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="modal fade" id="reward" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">山无棱江水为竭，冬雷震震夏雨雪，才敢请君舍</h4>
</div>
<div class="modal-body">
<div class="rewardType" align="center">
<ul class="list-unstyle list-inline">
<li style="margin-right: 20px;">
<input type="radio" name="type" id="alipay" onclick="PaymentUtils.change(0)" data-index="0" checked="checked" ><span style="margin-left: 5px;">支付宝</span>
</li>
<li style="margin-right: 20px;">
<input type="radio" name="type" id="wechat" onclick="PaymentUtils.change(1)" data-index="1"><span style="margin-left: 5px;">微信</span>
</li>
</ul>
</div>
<div id="qrcode-container" align="center" style="margin-top: 10px;"></div>
<div style="width: 100%;color: #a3a3a3;font-size: 16px;font-family: 'Microsoft YaHei';text-align: center;">
转账时请备注“<strong>博客赞助</strong>”
</div>
</div>
</div>
<small class="font-bold"></small>
</div>
<small class="font-bold"> </small>
</div>
<div id="loading">
<div class="filter"></div>
<div class="loader">
<div class="loading-1"></div>
<div class="loading-2">Loading...</div>
</div>
</div>
<footer class="footer">
<div class="container">
<div class="row">
<div class="col col-xs-12 col-md-12 col-lg-12">
<p>
<ul class="list-unstyled list-inline">
<li>其他连接：</li>
<li><a href="https://www.v8en.com/sitemap.html" target="_blank" title="网站地图" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-map-o fa-fw"></i>网站地图</a></li>
<li><a href="https://www.v8en.com/recommended" title="站长推荐" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-thumbs-o-up fa-fw"></i>站长推荐</a></li>
<li><a href="https://www.v8en.com/updateLog" title="更新记录" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-file-o fa-fw"></i>更新记录</a></li>
<li><a href="https://www.v8en.com/archives" title="归档目录" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-folder-o fa-fw"></i>归档目录</a></li>
<li><a href="https://www.v8en.com/disclaimer" title="免责声明" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-file-o fa-fw"></i>免责声明</a></li>
</ul>
</p>
<p>托管于<a href="https://curl.qcloud.com/K1RnwT5S" target="_blank" title="腾讯云-精选爆款云产品，大额代金券等你领" data-toggle="tooltip" data-placement="bottom" rel="external nofollow">腾讯云</a> · <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank" title="查看备案信息" data-toggle="tooltip" data-placement="bottom" rel="external nofollow">粤ICP备2022079647号-1</a></p>
</div>
<div class="col col-md-4"></div>
</div>
</div>
</footer>
<footer class="footer">
<div class="container">
<div class="row">
<div class="col col-xs-12 col-md-12 col-lg-12">
<p>Copyright v8en.com | Powered by <a href="https://gitee.com/yadong.zhang/DBlog" title="OneBlog是一款简洁美观、自适应的Java博客系统..." data-toggle="tooltip" data-placement="right" target="_blank" style="color: #4286ca;font-weight: 600;">OneBlog v2.3.4</a> </p>
</div>
</div>
</div>
</footer>
<a class="to-top" title="点击返回顶部" data-toggle="tooltip" data-placement="bottom"></a>
<script type="text/javascript" src="https://www.v8en.com/js/jquery.min.js"></script>
<script type="text/javascript" src="https://www.v8en.com/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://www.v8en.com/js/jquery.lazyload.min.js"></script>
<script type="text/javascript" src="https://www.v8en.com/js/jquery-confirm.min.js"></script>
<script type="text/javascript" src="https://www.v8en.com/js/jquery.fancybox.min.js"></script>
<script type="text/javascript" src="https://www.v8en.com/js/bootstrapValidator.min.js"></script>
<script type="text/javascript" src="https://www.v8en.com/js/nprogress.min.js"></script>
<script type="text/javascript" src="https://www.v8en.com/js/xss.min.js"></script>
<script type="text/javascript" src="https://www.v8en.com/js/mustache.min.js"></script>
<script type="text/javascript">
var appConfig = {
siteName: "Simon的博客",
wwwPath: "https://www.v8en.com",
cmsPath: "https://admin.v8en.com",
staticPath: "https://www.v8en.com",
lazyloadPath: "",
fileStoragePath: "https://upload.v8en.com/",
wxPraiseCode: "https://upload.v8en.com/oneblog/qrcode/20220702001947035.JPG" || "https://www.v8en.com/img/default.png",
zfbPraiseCode: "https://upload.v8en.com/oneblog/qrcode/20220702001947095.JPG" || "https://www.v8en.com/img/default.png",
anonymous: "1",
editorPlaceholder: "说点什么吧",
editorAlert: "讲文明、要和谐",
dynamicTitle: "您有一条新消息",
bubbleWord: "",
};
var oauthConfig = {
loginUserId: "",
loginUserName: "",
loginUserAvatar: ""
}
</script>
<script type="text/javascript" src="https://www.v8en.com/js/zhyd.core.js"></script>
<script type="text/javascript" src="https://www.v8en.com/js/zhyd.comment.js"></script>
<script type="text/javascript" src="https://www.v8en.com/js/zhyd.js"></script>
<script type="text/javascript" id="customJs">
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?d93e0a6530fcd1c4c338fbe7d11c7f7c";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
<script>
var typeMatch = location.href.match(/\/type\/([0-9]+)/);
if(null != typeMatch) {
var typeId = typeMatch[1];
$("#scrollmenu-" + typeId).addClass("active").attr("href", "javascript:void(0)");
}
</script>
</body>
</html>