search

benedekh / WeLoveClouds

Repository for submissions on the CloudDB course.
0 stars 1 forks source link

New branch with command stubs on it, this commit adds the stubs and f… #98

Closed ghost closed 7 years ago

ghost commented 7 years ago

…actory. Also adds getEcsCommand() to ParsedUserInput and Fixes a typo in the names of IKVEcsApi, KVEcsApiFactory and KVEcsApiV1. The two problems about the method signature of fromString() addressed in the dev/ECS-first-pass pull request are not fixed in this branch. Shall I pull #95 and #96 into this branch? The other naming problems have been fixed.

benedekh commented 7 years ago

Yes, please.

ghost commented 7 years ago

I have no idea why it's detecting a conflict, as far as I can tell these files are identical in both branches.

benedekh commented 7 years ago

Just simply do this (on the /dev/ecs-command-stubs) branch:

git fetch origin
git checkout -b dev/ecs-command-stubs origin/dev/ecs-command-stubs
git merge feature/ecs-project

and after that:

resolve the merge conflict by hand
git commit
git push
ghost commented 7 years ago

I had tried this before I made the comment, it had no effect. Commit ec80f9a.

banctilrobitaille commented 7 years ago

We'll close the branch as everything that is in this branch is already implemented