Github user asfgit closed the pull request at:
https://github.com/apache/jena/pull/24
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is
I'm trying to deal with pull requests in submission order.
I have pulled #24 but when I tried to pull #25, I got several merge
conflicts that were not obvious as to how they should be resolved. I
suspect it is because #24 was revised but #25 is relative to an older
#24 state.
The result was
I'm sorry, it is difficult to make a pull request be compatible with
other pull request as I can't tell in advance the merge order, and I
didn't want the file renames to go the wrong way around.
If you want I can recreate #24 from scratch now that you have merged
the #21 and #23. (Thank you!).
GitHub user stain opened a pull request:
https://github.com/apache/jena/pull/24
Apache jena osgi
Builds on #21 by splitting out jena-osgi* to submodules under
`apache-jena-osgi`.
Merges in #21, #22, #23
You can merge this pull request into a Git repository by running:
On 02/02/15 17:45, stain wrote:
GitHub user stain opened a pull request:
https://github.com/apache/jena/pull/24
Apache jena osgi
Builds on #21 by splitting out jena-osgi* to submodules under
`apache-jena-osgi`.
Merges in #21, #22, #23
Combined pull requests are harder
