[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user ajs6f commented on the issue: https://github.com/apache/jena/pull/339 That is one prob with using the Github on-line editors. But they _are_ convenient! I use them for corrections to human-centric docs like READMEs, etc. ---

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user xristy commented on the issue: https://github.com/apache/jena/pull/339 Thanks for fixing. Maybe that got introduced when I "corrected" the conflicts a couple of days ago since I did that inline - I suppose I won't used that approach again, otherwise the tools should have

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user afs commented on the issue: https://github.com/apache/jena/pull/339 TS_Text.java, line 54 had a leading backtick character. I thought I could safely fix it :-) +`, TestTextHighlighting.class ---

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user xristy commented on the issue: https://github.com/apache/jena/pull/339 What was the error? I puzzled that I was not seeing it. ---

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user afs commented on the issue: https://github.com/apache/jena/pull/339 Done! (One trivial syntax error fixed.) ---

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user xristy commented on the issue: https://github.com/apache/jena/pull/339 Thanks for the help. I appreciate it. ---

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user ajs6f commented on the issue: https://github.com/apache/jena/pull/339 Relax-- it's not nearly as bad as all that. :grin: I often say that having to rebase PRs a lot is good-- it means the project is lively and the code is evolving. For me, the trick (as almost

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user xristy commented on the issue: https://github.com/apache/jena/pull/339 I'm glad it was comparatively simple. I was not looking forward to experimenting with rebasing in public -;) ---

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user ajs6f commented on the issue: https://github.com/apache/jena/pull/339 Cool. That's essentially an in-line version of the same workflow, minus the rebase. That means you end up with an extra no-real-content commit

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user xristy commented on the issue: https://github.com/apache/jena/pull/339 They were simple enough to fix inline via the github tool. ---

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user ajs6f commented on the issue: https://github.com/apache/jena/pull/339 It's no big deal-- happens all the time! Do you know how to rebase and resolve conflicts in Git? https://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user xristy commented on the issue: https://github.com/apache/jena/pull/339 Good grief!. Yes the conflicts are with PR [#335](https://github.com/apache/jena/pull/335). I apparently merged too fast when I saw the approval for 335 and proceeded with the development of the

[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting

Github user afs commented on the issue: https://github.com/apache/jena/pull/339 There are some conflicts (due to PR #335, I think). Is this simple to resolve? Is that because this PR includes some of the other one? ---