search

protegeproject / protege-client

Provides client functionality for the Protege Desktop application to connect to an OWL Ontology Server.
16 stars 9 forks source link

Missing commit from metaproject-integration branch #35

Closed rsgoncalves closed 8 years ago

rsgoncalves commented 8 years ago

Commit 2345746 (metaproject-integration branch) should be git-cherry-picked into the http-metaproject-integration branch.

bdionne commented 8 years ago

hmm, I spent a few minutes looking at this, and each line seems to be accounted for in the http branch. Where specifically was the null pointer? Are you still seeing it?

rsgoncalves commented 8 years ago

I'm not getting the null pointer (it was in the uncommitted changes dialog). I just remembered that after starting working on the HTTP server I git cherry-picked the few last commits that didn't seem to be in the HTTP server commit log, but skipped this last one because it was conflicting at the time with some local changes of mine, and figured I'd post an issue before I forget again. I guess this can be closed then.

bdionne commented 8 years ago

ok, let's leave this around then until we're sure nothing was dropped. When I was merging/rebasing that branch a lot into the http branch there were often conflicts to fix. Normally when I'm not so lazy I make an effort to split commits into smaller chunks to preserve as much of the history and attribution as possible.

bdionne commented 8 years ago

this seems to be ok