andre/git-recipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix image url (#54)

Browse Source
This commit is contained in:
Park Li
2018-06-03 12:21:06 -05:00
committed by LitoMore
parent 9bdcbfb6cc
commit 04a294ceae
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/代码合并Merge还是Rebase.md
View File

@ -33,7 +33,7 @@ git merge master feature
feature 分支中新的合并提交（merge commit）将两个分支的历史连在了一起。你会得到下面这样的分支结构： feature 分支中新的合并提交（merge commit）将两个分支的历史连在了一起。你会得到下面这样的分支结构：
![enter image description here](https://www.atlassian.com/git/images/tutorials/advanced/merging-vs-rebasing/02.svg) ![enter image description here](https://www.atlassian.com/dam/jcr:e229fef6-2c2f-4a4f-b270-e1e1baa94055/02.svg)