January 2023
Intermediate to advanced
458 pages
14h 16m
Chinese
Content preview from 可编程网络自动化
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.
266
｜
第
8
章
在这种情况下，当合并分支时，
两个
分支上的变更需要协调。因为
master
分支也有自己的
变更，所以不可能只“重放”
sw4
分支到主干分支的改动
。因此，
Git
创建了一个
合并提
交
。来看这个文件。
[vagrant@centos net-auto]$
git cat-file -p 81f5963
tree e71cfa26549241b609fa39e69dc51fdafd1d7cb4
parent 183b8fe2d02bbd6b2b7a19ecc39dc9e792fe2e75
parent 40e88b88271b535cceb311bb904d6afac20c15c3
author John Smith <john.smith@networktocode.com> 1465334492 +0000
committer John Smith <john.smith@networktocode.com> 1465334492 +0000
Merge branch 'sw4'
[vagrant@centos net-auto]$
注意，这里存在
两个
父提交，其代表将
sw4
分支合并入
master
分支之前，我们对每个分支
的提交。这正是
Git
知道分支已经收敛的方式，也是
Git
维护提交之间长期关系的方式。
sw4
分支的提交现在已经合并入
master
分支，可以使用
git branch -d sw4
删除该分支了。
[vagrant@centos net-auto]$
git branch ...
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Read now
Unlock full access
More than 5,000 organizations count on O’Reilly
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.Julian F.
I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.Addison B.
I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.Amir M.
I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.