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.

Sign up for GitHub

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

Jump to bottom

merge conflict #22

Open
laurenmcguigan opened this issue Dec 5, 2016 · 14 comments
Open

merge conflict #22

laurenmcguigan opened this issue Dec 5, 2016 · 14 comments

Comments

@laurenmcguigan
Copy link
Collaborator

@RJP43 I made changes to the graveyard info file before I could pull yours in and now I have a merge conflict. How do I fix it?
@laurenmcguigan
Copy link
Collaborator Author

Changes to be committed:

modified:   ODD/graveyardODD.html
modified:   ODD/graveyardODD.odd
modified:   ODD/out/graveyardODD.rng
new file:   XSLT/laurXMLtoTEI.xsl
modified:   sampleTEIHeader.xml

Unmerged paths:
(use "git add ..." to mark resolution)

both modified:   graveyardInfo.xml

this is what my terminal says

@RJP43
Copy link
Collaborator

RJP43 commented Dec 5, 2016 •
edited
Loading

@laurenmcguigan are you on campus?

@RJP43
Copy link
Collaborator

RJP43 commented Dec 5, 2016 •
edited
Loading

@laurenmcguigan I am in the faculty lounge if you want to come here.

@laurenmcguigan
Copy link
Collaborator Author

Im not on campus and I won't be there until tomorrow. On my desktop I have the changes I made and the ones you made but it's appearing with a bunch of <<<<<<<<<<<<<HEAD I don't know what that means.

@RJP43
Copy link
Collaborator

RJP43 commented Dec 5, 2016

@laurenmcguigan yea those get inserted whenever the files have diverged they indicate where the files are different. The changes you made are they just to the end of the document?

@RJP43
Copy link
Collaborator

RJP43 commented Dec 5, 2016

@laurenmcguigan like after the point where my comment indicates where we left off?

@laurenmcguigan
Copy link
Collaborator Author

Its just at the bottom. I added more occupants.

@RJP43
Copy link
Collaborator

RJP43 commented Dec 5, 2016

@laurenmcguigan if you were just adding onto the file then there should be no issue merging our two files together. If you do git status, then git add -A, then git commit -m "with your message in here" then git status again it should say that you and the remote have diverged... at that point if you do git pull the window should pop up for you to merge the commit ... let me know if it does and I will tell you where from there...

@RJP43
Copy link
Collaborator

RJP43 commented Dec 5, 2016

when the pop-up box comes up use this issue to save the merge commit message and get back to terminal then at that point you should be able to commit one more time (basically adding and committing the newly merged file) and then push without an issue.

@laurenmcguigan
Copy link
Collaborator Author

So it seems like it is fixed and everything is there. I just still have those weird head things that are making oxygen angry. can I just delete them?

@RJP43
Copy link
Collaborator

RJP43 commented Dec 5, 2016

ehhh if they are there that means one of our changes is likely not showing up. Dr. B had gone in and made some edits as well soooo I am not sure if you would recognize if all the changes are there or not. I guess just go in and delete those head things for now and finish your markup and push then we can see if everything merged correctly tomorrow when we get together.

@laurenmcguigan
Copy link
Collaborator Author

I think it is fixed

@laurenmcguigan
Copy link
Collaborator Author

@ebeshero @RJP43 it looks like all the changes were pulled in as well as my additions. If you want to take a look and check that what you added is there, that would be great!

@ebeshero
Copy link
Collaborator

ebeshero commented Dec 6, 2016

@laurenmcguigan It looks fine to me--but this is a little brittle to check without a schema!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@ebeshero @RJP43 @laurenmcguigan