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

Add grammar Feature/language sparql ttl #1746

Conversation

VladimirAlexiev
Copy link

No description provided.

@VladimirAlexiev
Copy link
Author

This PR #1746 adds better support for SPARQL and Turtle (#1553), namely fixes problems in #1736

@VladimirAlexiev VladimirAlexiev mentioned this pull request May 9, 2018
@VladimirAlexiev
Copy link
Author

I fixed two conflicts (relevance problems) with xml and objectivec, but I am stuck at this one:

@isagalaev can you help diagnose https://travis-ci.org/isagalaev/highlight.js/jobs/376860564#L917?
It says elixir is detected instead of ttl. But when I try test/detect/ttl/default.txt in tools/developer.html, I get score 46 for elixir (and ruby) and 98 for ttl: so how come elixir is detected?

Thanks in advance!

@gusbemacbe
Copy link
Contributor

@VladimirAlexiev, see #1678 (comment).

@VladimirAlexiev
Copy link
Author

@gusbemacbe long story short, I should not hold my breath for this PR to be merged then?

@gusbemacbe
Copy link
Contributor

No, because he doesn't intend anymore to merge. You can see here that most of pull requests were not merged and hundred issues were not solved. This repository is abandoned.

@gusbemacbe
Copy link
Contributor

@VladimirAlexiev, this repository became an organisation and has new maintainers. Please back up the files and rebase the latest version.

@VladimirAlexiev
Copy link
Author

@gusbemacbe Sorry, I'm not very fluent with git, so how do I do that?
Is it enough if I just merge the 3 conflicting files reported above?

@gusbemacbe
Copy link
Contributor

@VladimirAlexiev

  1. Open the terminal:
    a. git clone https://github.com/VladimirAlexiev/highlight.js old-project
    b. git clone https://github.com/highlightjs/highlight.js new-project

  2. cd new-project && mkdir new-project && git mv !(new-project) new-project

  3. git commit -a -S -m “Moving new project into its my own old subdirectory”

If you see the error, do not worry.

  1. cd ../old-project
  2. git remote add new-project ../new-project
  3. git fetch new-project
  4. git checkout -b feature/merge-new-project
  5. git merge -S --allow-unrelated-histories new-project/master

And type your GitHub username and your password.

  1. git push origin feature/merge-new-project

  2. git remote rm new-project

  3. Open your repository page here

  4. Select the branch and change the branch master to feature/merge-new-project

  5. Click in "pull request", your selected branch (feature/merge-new-project) will be selected and compared to.. And select the branch master of your repository.

  6. Submit the pull request and then merge it to your master branch.

@joshgoebel joshgoebel changed the title Feature/language sparql ttl Add grammar Feature/language sparql ttl Oct 11, 2019
@joshgoebel
Copy link
Member

Closing, seems to be superseded by #1844

@joshgoebel joshgoebel closed this Dec 24, 2019
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.

4 participants