danascheider

On branch master
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	modified:   hello_world.rb

danascheider

error: The branch 'unmerged-branch' is not fully merged.
If you are sure you want to delete it, run 'git branch -D unmerged-branch'.

danascheider

Deleted branch allow-user-input (was 5f38523).

danascheider

Updating 106b5ea..5f38523
Fast-forward
 hello_world.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

danascheider

[allow-user-input 5f38523] Accept name as user input
 1 file changed, 3 insertions(+), 1 deletion(-)

danascheider

diff --git a/hello_world.rb b/hello_world.rb
index 733c205..7146b79 100644
--- a/hello_world.rb
+++ b/hello_world.rb
@@ -1 +1,3 @@
-puts 'Hello World!'
+puts 'Please enter a name:'
+name = gets
+puts 'Hello ' + name + '!'
(END)

danascheider

On branch allow-user-input
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   hello_world.rb

no changes added to commit (use "git add" and/or "git commit -a")

danascheider

puts 'Please enter a name:'
name = gets
puts 'Hello ' + name + '!'

danascheider

* master
  my-branch-1
  my-branch-2

danascheider

[master (root-commit) 106b5ea] Print 'Hello World' to the console
 1 file changed, 1 insertion(+)
 create mode 100644 hello_world.rb