You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@jena.apache.org by xristy <gi...@git.apache.org> on 2018/11/16 18:41:11 UTC

[GitHub] jena pull request #491: merge of IndexErrorOption

GitHub user xristy opened a pull request:

    https://github.com/apache/jena/pull/491

    merge of IndexErrorOption

    PR for JENA #1636

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/BuddhistDigitalResourceCenter/jena JENA-1636-IgnoreIndexErrors

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/jena/pull/491.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #491
    
----
commit dd3527ddbf0d1b82565ecd00bc1b2900b065731c
Author: Code Ferret <co...@...>
Date:   2018-11-16T18:37:17Z

    merge of IndexErrorOption

----


---

[GitHub] jena pull request #491: merge of IndexErrorOption

Posted by asfgit <gi...@git.apache.org>.

Github user asfgit closed the pull request at:

    https://github.com/apache/jena/pull/491


---

[GitHub] jena issue #491: merge of IndexErrorOption

Posted by xristy <gi...@git.apache.org>.

Github user xristy commented on the issue:

    https://github.com/apache/jena/pull/491
  
    I think I see why I was getting unmerged commits. I was needed to do a commit after the ``merge --squash``


---

[GitHub] jena issue #491: merge of IndexErrorOption

Posted by afs <gi...@git.apache.org>.

Github user afs commented on the issue:

    https://github.com/apache/jena/pull/491
  
    Looking at other recent PRs, it looks like they are pulled from your BDRC repo then close the PR. This is why they are "closed", not "merged".
    
    The documented workflow is to merge from the github PR - it is not proscriptive and if your way works for you, then fine. It's the same commits (same SHA1), different route.
    
    Normally I do:
    
    git pull github pull/NNN/head --no-ff
    git push
    
    as in your modified "11.". Then when the GH repo sync's up with Apache master (a few minutes at most), the PR here goes purple/merged and has a "delete branch" option to delete the branch in your repo that you created the PR from.
    
    The "This closes \#NNN" text does not have to be in the first line of the commit message. 
    
    If convenient, could you put "JENA-nnnn:" on the front of important commits or the merge commit message? Don't matter if you don't, just makes things a but more findable from just git logs in my experience.



---