Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

episode 9 - conflicts: update output to reflect most recent version of git #627

Open
kekoziar opened this issue May 6, 2019 · 2 comments

Comments

Projects
None yet
2 participants
@kekoziar
Copy link
Contributor

commented May 6, 2019

The most recent version of git and github have slightly different responses than the text originally in the lesson. The below output is the most current version of the output. In the below output, the commit IDs have been updated to reflect IDs originally used in the lesson, for continuity.

"add a line in our home copy" git push origin master output is

Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 8 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 331 bytes | 331.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
To https://github.com/vlad/planets.git
   29aba7c..dabb4c8  master -> master

"Line in my copy" error message for git push origin master

To https://github.com/vlad/planets.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://github.com/vlad/planets.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

After graphic: git pull origin master

remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 3 (delta 2), reused 3 (delta 2), pack-reused 0
Unpacking objects: 100% (3/3), done.
From https://github.com/vlad/planets
 * branch            master     -> FETCH_HEAD
   29aba7c..dabb4c8  master     -> origin/master
Auto-merging mars.txt
CONFLICT (content): Merge conflict in mars.txt
Automatic merge failed; fix conflicts and then commit the result.

"merge changes from github"
git push origin master

Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 8 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 645 bytes | 645.00 KiB/s, done.
Total 6 (delta 4), reused 0 (delta 0)
remote: Resolving deltas: 100% (4/4), completed with 2 local objects.
To https://github.com/vlad/planets.git
   dabb4c8..2abf2b1  master -> master

back again to collaborator who made the first change

git pull origin master

remote: Enumerating objects: 10, done.
remote: Counting objects: 100% (10/10), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 6 (delta 4), reused 6 (delta 4), pack-reused 0
Unpacking objects: 100% (6/6), done.
From https://github.com/vlad/planets
 * branch            master     -> FETCH_HEAD
   dabb4c8..2abf2b1  master     -> origin/master
Updating dabb4c8..2abf2b1
Fast-forward
 mars.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@kekoziar kekoziar added this to the June 2019 Release milestone May 6, 2019

@kekoziar kekoziar referenced this issue May 6, 2019

Open

June 2019 Lesson Release checklist #611

8 of 12 tasks complete
@munkm

This comment has been minimized.

Copy link
Collaborator

commented May 22, 2019

For what version of git did these outputs change? Are we assuming learners will have this version or an older version (for the gitbash installer that's distributed will learners have an older version?)?

@munkm

This comment has been minimized.

Copy link
Collaborator

commented May 22, 2019

Ah ok I see it's using a recent version. Maybe because the output has been updated we want to put something in the instructor guide that some leaners may have slightly different output if they have an older version of git on their machine.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.