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.
使用
Git
控制源代码
｜
263
-rw-rw-r-- 1 vagrant vagrant 84 May 12 20:33 sw4.txt
-rw-rw-r-- 1 vagrant vagrant 135 May 31 14:56 sw5.txt
-rw-rw-r-- 1 vagrant vagrant 221 Jun 7 16:53 sw6.txt
vagrant@jessie:~/net-auto$
以上代码演示了在分支的帮助下如何将变更与
master
分支隔离开，而这正是使用分支的一
个关键好处。有了分支，你可以做出变更并对这些变更进行测试，然后再将它们丢弃（如
果有必要的话），而在此过程中，
master
分支安然无恙，不会受到任何影响。
但是，如果想保留分支上的变更呢？可能你尝试了一个新的
Jinja
模板
，结果这个模板在
测试中表现得非常不错，现在你想使其成为仓库的永久部分。这正是
合并
分支发挥作用的
地方。
8.6.3
合并分支和删除分支
在合并分支之前，再来看看
Git
中提交对象的内容。在我们的示例仓库中，检查一下
testing
分支上最新提交的内容。
vagrant@jessie:~/net-auto$
git checkout testing
Switched to branch 'testing'
vagrant@jessie:~/net-auto$
git cat-file -p b45a2b1
tree f6b5dfbfdbf6bc29f04300c9a82c6936397d9b27 ...
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.