search

w3c / rdf-star

RDF-star specification
https://w3c.github.io/rdf-star/
Other
119 stars 23 forks source link

Added Overview content #67

Closed bobdc closed 3 years ago

bobdc commented 3 years ago

Note that some content that was in the Overview before won't show up in the browser with this version but is in the HTML file, commented out in case someone wants to move it somewhere else.

Preview | Diff

pchampin commented 3 years ago

@bobdc is this different from #66 ? Can you please close one of them if they are redundant? Also, could you please rebase it on the latest commit in the main branch -- this would make the "diff" link less noisy.

bobdc commented 3 years ago

@pchampin I closed #66. (I did #67 because I got an error message for #66, so I was trying again.)

When I do a pull of the main branch in my fork, it says I'm already up to date. I thought if it pulled something more recent than what I had I would rebase with that.

I'm probably misunderstanding some of the required steps (especially in managing the relationship of my fork to the original repo) because I'm not an every-day github user.

pchampin commented 3 years ago

I'm probably misunderstanding some of the required steps (especially in managing the relationship of my fork to the original repo) because I'm not an every-day github user.

Yes, you fell in the same trap we all did for our first pull-request! That's really something Github should handle better :-/

The first thing to understand is that the main branch of your fork is not automatically synchronized with the main branch from the original repo. You have to synchronized it manually. Instructions about how to do that are available here: https://timonweb.com/misc/how-to-update-a-forked-repo-from-an-upstream-with-git-rebase-or-merge/ (with some adaptation, of course).

The second thing to know is that you should not make a pull request from your main branch. If your PR gets not merged, then your main branch will have irremediably diverged from the upstream main branch, which you don't want. So you should create a dedicated branch for every PR you intend to submit. (that being said, we'll manage with this one, don't worry)

afs commented 3 years ago

@bobdc - Would it be possible to setup your account so the IPR is automatically validated?

https://labs.w3.org/repo-manager/pr/id/w3c/rdf-star/67

If you believe it should work, there is an issues list for that ("meta-issues"?!)

https://github.com/w3c/ash-nazg/issues/

I had transient problems: https://github.com/w3c/ash-nazg/issues/189

bobdc commented 3 years ago

Thanks! A pull request from a branch of my fork was the first thing I tried (#66) and when that didn't work I tried it from main on my fork (#67).

When you wrote "we'll manage with this one" did you mean that you have the paragraphs I wrote ready to paste into some branch, or should I try another PR?

After I saw Andy's comment I think I managed to link my github account to the W3C, but I'm not quite sure what my next step is.

Bob

On 12/13/20 7:14 AM, Pierre-Antoine Champin wrote:

I'm probably misunderstanding some of the required steps
(especially in managing the relationship of my fork to the
original repo) because I'm not an every-day github user.

Yes, you fell in the same trap we all did for our first pull-request! That's really something Github should handle better :-/

The first thing to understand is that the |main| branch of your fork is not automatically synchronized with the |main| branch from the original repo. You have to synchronized it manually. Instructions about how to do that are available here: https://timonweb.com/misc/how-to-update-a-forked-repo-from-an-upstream-with-git-rebase-or-merge/ (with some adaptation, of course).

The second thing to know is that you should not make a pull request from your |main| branch. If your PR gets not merged, then your |main| branch will have irremediably diverged from the upstream |main| branch, which you don't want. So you should create a dedicated branch for every PR you intend to submit. (that being said, we'll manage with this one, don't worry)

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/w3c/rdf-star/pull/67#issuecomment-743998824, or unsubscribe https://github.com/notifications/unsubscribe-auth/ADQ3V3GTJNJCKDW5TW6MNXDSUSV2XANCNFSM4UYGV2LA.

pchampin commented 3 years ago

@bobdc it seems that the IPR problem is gone, so your linking your GH account worked. :+1:

If the other PR was on a separate branch, the cleaner way would probably to close this one and reopen #66. Then you could reset your main branch in sync with the upstream main branch.

pchampin commented 3 years ago

Actually, after a closer look at your commits, it seems that this is not no much a problem of rebasing. You seem to have removed content from the file (e.g. here, the parts about the SPARQL* result format).

It looks like you worked on an old version of the HTML file, but committed it on top of a recent commit, which GIT interpreted as an intentional removal of the other recent parts.

I am sorry, but I think the best solution is for you to

It that's too much hassle, or you don't feel comfortable with Github do to that, I can take care of it.

bobdc commented 3 years ago

Those really are the steps that I remember doing, but in the past I have messed it up along the way. I will try again.

On 12/13/20 1:20 PM, Pierre-Antoine Champin wrote:

Actually, after a closer look at your commits, it seems that this is not no much a problem of rebasing. You seem to have removed content from the file (e.g. here https://github.com/w3c/rdf-star/pull/67/commits/66318a28b59108ebcf38477cce13f030ed00d7bd#diff-095b037644a81d9d9197a0e09a6b76b915ec368fd69a883278588a0b127ebc68L628, the parts about the SPARQL* result format).

It looks like you worked on an old version of the HTML file, but committed it on top of a recent commit, which GIT interpreted as an intentional removal of the other recent parts.

I am sorry, but I think the best solution is for you to

  • copy the content you added in the Overview section
  • start afresh with a clean fork of the repo
  • paste your content in a new branch
  • and push that new branch as a new PR.

It that's too much hassle, or you don't feel comfortable with Github do to that, I can take care of it.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/w3c/rdf-star/pull/67#issuecomment-744047392, or unsubscribe https://github.com/notifications/unsubscribe-auth/ADQ3V3DJLXGKONEE7EADYWDSUUAWTANCNFSM4UYGV2LA.

bobdc commented 3 years ago

Creating a new pull request as described in recent comments.