search

kes213 / Harlem_Ren_Project

This repository is a place for the Harlem Renaissance Project Team to collaborate.
1 stars 1 forks source link

Merge Conflict #9

Open kes213 opened 6 years ago

kes213 commented 6 years ago

@ebeshero I'm having a merge conflict, and I need some help getting out of it.

I think it has something to do with the files that Tylar pushed yesterday being in double folders. In a window before this, it told me that all of the Bontemps poems would be overwritten with the merge.

I just did a git push a few moments ago, but it won't let me pull anything new in.

capture
ebeshero commented 6 years ago

@kes213 The first thing to do is to check git status. What does it say?
I outlined a series of steps on this for @flowerbee1234 yesterday, so I'm going to point you there: https://github.com/kes213/Harlem_Ren_Project/issues/8

ebeshero commented 6 years ago

I'll paste them here, too: Once you've checked git status, it'll probably show you some untracked files that were changed. See if this makes sense. To finish the merge:

1) git add -A (this makes sure you add and track everything you just worked on). 2) git commit -m "your commit message" (commit all the stuff you just worked on) 3) git status (read what Git tells you here--and report back if it's anything weird or confusing.) 4) git pull (try the pull after you've added and committed your changes). It'll probably say you're in a merge conflict state--or it might open a new shell window inviting you to type something...I can walk you through this part, but you can basically get out of that by typing "resolving merge" and hitting these keys in series: esc colon wq (That literally means "escape: write quit", and it'll bring you back to the normal command prompt.) 5) git status (read what it says. If all went well there will be multiple commits to push--one is the commit of your new files, and the other is the result of Git merging in your team's updates.) 6) if it's indicated by the previous step: git push (and you're done).