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

#253 Add more details to XmlGenDom parsing error #254

Merged
merged 1 commit into from Dec 15, 2017

Conversation

shengsang
Copy link

Add non-DocumentException Exceptions as the cause for the constructed RemoteException in XmlGenDom.fromXML()

@michaelrice
Copy link
Member

Can you squash this into just a single commit? Then Ill merge it.

@shengsang
Copy link
Author

Hope I'm doing the squash correctly since I'm fairly new to Github. I did the squash, but before pushing, I had to pull.

@michaelrice
Copy link
Member

nah, now you are up to 5 commits. You will have to force the push too since you have pushed to github already.

Try:
git rebase -i HEAD~5

In the text editor that comes up, replace the words "pick" with "squash" next to the commits you want to squash into the commit before it. Save and close the editor, and git will combine the "squash"'ed commits with the one before it. You will also be given a chance to change the commit message. Once you have the commit message you want then save and do the following command to get it pushed to this pull request.

git push origin issue_253 --force

…s a RemoteException cause while parsing XML document
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants