Skip to content

Compiles jsoncpp with QNX 6.6 #373

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

Merged
merged 1 commit into from
Oct 4, 2015

Conversation

antonindrawan
Copy link
Contributor

No description provided.

@cdunn2001
Copy link
Contributor

Seems good. Please rebase after #371 and re-test. Then we'll merge.

@antonindrawan
Copy link
Contributor Author

Hi Christoper,

It still compiles after merging PR 371.

It was my first time with re-basing and I got some error messages when doing a git push:
" hint: Updates were rejected because the tip of your current branch is behind".

Anyway, it seems that PR 371 is already merged to my branch and it still compiles

Regards,
Anton

@cdunn2001
Copy link
Contributor

git push -f origin QNX_support

You need -f because it's a "rebase", not a "fast-forward". Try again. It's worth learning, and it saves me some time. We don't want that new merge commit. You shouldn't need that if you rebase onto the tip of master. Try rebase -i to get rid of it.

Anyway, try it once more. I'll rebase myself if you still have trouble.

@antonindrawan
Copy link
Contributor Author

Thanks for your hint about the -f option.

I just reverted the merge commit and pushed it to QNX_support. Hopefully, it is now fine to merge it.
Please let me know.

Update:
Thank you for merging it :)

cdunn2001 added a commit that referenced this pull request Oct 4, 2015
@cdunn2001 cdunn2001 merged commit beae999 into open-source-parsers:master Oct 4, 2015
@antonindrawan antonindrawan deleted the QNX_support branch January 4, 2018 18:51
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.

2 participants