![]() 2 commits – something that took a bit of getting used to for me is that this is the number of commits included in this branch, and not the number of files.Create pull request – This is the action you’ll take next.This means no merge conflict, so we’re good. These branches can be automatically merged – Awesome. On this comparing change page, you’ll see the following items: (If you tried the other way, you’ll immediately get a message that “readme-draft is up to date with all commits from master,” because remember, the readme-draft was based from master only 2 commits ago.)Īlrighty, lots happening on this page, but let’s chill, and only pay attention to 3 things, plus some lagniappe. Next you’ll need to specify that you want the readme-draft branch (head) to be merged into the master branch (base). (It doesn’t matter which branch you are currently viewing.) Then click on the New pull request button. Here’s the corresponding SO question/answer to sanity check.)įirst, you’ll click on Pull requests tab. (aside: I’m pretty sure the only way to do a merge on GitHub is via a Pull Request, even if you are the only developer. ![]() Let’s also assume (for now) you are like me, a solo developer on many of your repos. Now that you are ready to commit the file, you want to merge it into master. You created the README.md file in this non-master branch, because you wanted a few days to work (and sleep) on your writing. The scenario is you’ve created a README.md file in a branch called readme-draft on your repo. Otherwise, it’s just magic happening under the scenes. Why? Because I find it more straightforward to explain how things work when you have to set it up manually the first few times. Yep, if you’ve been reading this series, you knew this tip was coming.įor explanation purposes, I’m going to ignore for now the Compare & pull request buttons you’ve probably been seeing if you’ve been following along at home. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |