search

GIPSY-dev / WSC-Gen

The Planning Graph Algorithm Implementation
1 stars 1 forks source link

PM2 - REST service - second PR #9

Open Mchapuis opened 6 years ago

Mchapuis commented 6 years ago

This is the original branch for the REST service. This branch is only for PM2 part 3.

jashanj0tsingh commented 6 years ago

@Mchapuis Thank you for the second PR, however we are still at square one. You will need to resolve the conflicts at some point before I can merge them after review. @smokhov

smokhov commented 6 years ago

@Mchapuis -- the conflicts listed can be resolved online here on GitHub by editing them out; err on the side of inclusion.

Mchapuis commented 6 years ago

I fixed the conflicts. I still need to update the README for this service tomorrow.

smokhov commented 6 years ago

@Mchapuis -- are we still waiting for the README here?

Mchapuis commented 6 years ago

1- I reverted the merge from ws in case this was creating issues ( I was seeing changes in my branch ) 2- I fixed the conflicts with the base branch ( similar fixes than last time ) 3- Updated the README for REST

Mchapuis commented 6 years ago

I just realized that I am creating a new commit when I resolve conflicts. I can see a new commit called Merge branch WS into PM2- Post-Soap-Fixes .

Mchapuis commented 6 years ago

The full documentation has been pushed to bitbucket. I hope this will answer your questions.