mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-13 08:04:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update grabbingOneCommit.js

Browse source
This commit is contained in:
Jan Christopher Vogt 2015-02-26 12:52:17 -05:00
parent 16f35de32b
commit 63163bd10d
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/levels/mixed/grabbingOneCommit.js
View file

@ -46,7 +46,7 @@ exports.level = {
"", "",
"Here's a development situation that often happens: I'm trying to track down a bug but it is quite elusive. In order to aid in my detective work, I put in a few debug commands and a few print statements.", "Here's a development situation that often happens: I'm trying to track down a bug but it is quite elusive. In order to aid in my detective work, I put in a few debug commands and a few print statements.",
"", "",
"All of these debugging / print statements are in their own branches. Finally I track down the bug, fix it, and rejoice!", "All of these debugging / print statements are in their own commits. Finally I track down the bug, fix it, and rejoice!",
"", "",
"Only problem is that I now need to get my `bugFix` back into the `master` branch. If I simply fast-forwarded `master`, then `master` would get all my debug statements which is undesirable. There has to be another way..." "Only problem is that I now need to get my `bugFix` back into the `master` branch. If I simply fast-forwarded `master`, then `master` would get all my debug statements which is undesirable. There has to be another way..."
] ]