课程: Coding Exercises: GitHub

免费学习该课程！

今天就开通帐号，24,700 门业界名师课程任您挑！

How do you merge a linear history?

How do you merge a linear history? - GitHub教程

课程: Coding Exercises: GitHub

开始一个月试用 购买团队方案

How do you merge a linear history?

“

(video game sounds) - [Instructor] Let's say that you're working on a new feature for your project, but in the meantime, someone is working on a different feature and they've already pushed it to GitHub and merged that commit onto your main branch. What's a good way to add your commits after their commits without creating a messy timeline? I'll give you a couple of seconds to pause the video and think about how you may have solved this. (8-bit video game music) One of the first commands you learn when working with GitHub is how to merge your changes onto a master branch. Merging is the more common of the merge commands, but there's another merging strategy that will work better to create a more linear history that takes into account other changes that users might have performed. Here's a copy of the project on my local machine. Right now, I'm on a branch called CleanUp. To see the commit history, I can issue a…

内容