Cant merge on step 5


#1

There's noting to merge from origin "Sally's proyect"
This is what the excersise tells me.

2.You are on your local master branch. In your commit history, the commit message of the HEAD commit is:

Add first question to Physics quiz

From the terminal, merge with origin/master, where Sally's most recent commits are.

Notice the output:

Updating a2ba090..bc87a1a
Fast-forward
 biology.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

this is how behave the exercise:

$ git merge origin/master                                                                        
merge: origin/master - not something we can merge                                                
$ git show HEAD                                                                                  
commit 2fd7d9b248e0b4a3b531b9af3bb61916d42ad45f                                                  
Author: danasselin <johndoe@example.com>                                                         
Date:   Thu Oct 29 15:42:55 2015 -0400                                                           
                                                                                                 
    Add first question to physics quiz                                                           
                                                                                                 
diff --git a/physics.txt b/physics.txt                                                           
index e69de29..3d47f43 100644                                                                    
--- a/physics.txt                                                                                
+++ b/physics.txt                                                                                
@@ -0,0 +1,3 @@                                                                                  
+1. A scalar is a quantity which has both magnitude and direction.                               
+a) true                                                                                         
+b) false                                                                                        
\ No newline at end of file                                                                      
$

#2

This topic was automatically closed 7 days after the last reply. New replies are no longer allowed.