search

telefonicaid / fiware-cosmos

fiware-cosmos toolkit for administration and support. Includes Sahara plugin
GNU Affero General Public License v3.0
11 stars 15 forks source link

Sinfonier Docs #124

Closed ffr4nz closed 8 years ago

frbattid commented 8 years ago

Great, this definitely LGTM :)

Nevertheless, this PR cannot be merged until you fix the conflicts that would arise if your local branch is directly merged into my upstream develop. This is because there have been changes in the upstream develop that are not within your forked repo. In order to get those changes, you will have to merge the upstream develop into your local branch; this will do the conflicts appear in your local branch, and they are fixed as explained here. Then, both branches will be synchronized except for the new code your are adding.

ffr4nz commented 8 years ago

Thanks @frbattid, last commit solve conflicts and merge is available.