$ git status
On branch develop
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

        modified:   composer.json
        modified:   composer.lock
        new file:   db/migrations/20190506124609_user_feed_import.php
        new file:   db/migrations/20190905182104_user_can_use_feeds.php
        new file:   phpcs.xml
        new file:   protected/commands/FeedCommand.php
        modified:   protected/config/main.php
        modified:   protected/helpers/GridHelper.php
        modified:   protected/helpers/HUser.php
        modified:   protected/modules/apartments/models/Apartment.php
        modified:   protected/modules/socialposting/controllers/MainController.php
        new file:   protected/modules/userFeedImport/UserFeedImportModule.php
        new file:   protected/modules/userFeedImport/controllers/MainController.php
        new file:   protected/modules/userFeedImport/controllers/backend/MainController.php
        new file:   protected/modules/userFeedImport/helpers/FeedApartmentHelper.php
        new file:   protected/modules/userFeedImport/helpers/FeedImagesHelper.php
        new file:   protected/modules/userFeedImport/helpers/FeedLocationHelper.php
        new file:   protected/modules/userFeedImport/helpers/PhoneHelper.php
        new file:   protected/modules/userFeedImport/helpers/UserFeedHelper.php
        new file:   protected/modules/userFeedImport/models/FeedDownloadResult.php
        new file:   protected/modules/userFeedImport/models/FeedOperationResult.php
        new file:   protected/modules/userFeedImport/models/FeedParser.php
        new file:   protected/modules/userFeedImport/models/FeedParsingResult.php
        new file:   protected/modules/userFeedImport/models/FeedValidationResult.php
        new file:   protected/modules/userFeedImport/models/UserFeed.php
        new file:   protected/modules/userFeedImport/views/backend/_form.php
        new file:   protected/modules/userFeedImport/views/backend/_list.php
        new file:   protected/modules/userFeedImport/views/backend/admin.php
        new file:   protected/modules/userFeedImport/views/backend/create.php
        new file:   protected/modules/userFeedImport/views/backend/update.php
        new file:   protected/modules/userFeedImport/views/form.php
        new file:   protected/modules/userFeedImport/views/index.php
        modified:   protected/modules/userads/controllers/MainController.php
        modified:   protected/modules/users/models/User.php
        modified:   protected/modules/users/views/backend/_form.php
        modified:   protected/views/layouts/main-admin.php
        modified:   themes/basis/views/modules/apartments/views/_view_column.php

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   themes/basis/assets/css/custom.css

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    assets/.empty
        deleted:    protected/runtime/already_install
        modified:   robots.txt


sdelk@DESKTOP-4V6CKCP MINGW64 /c/vhosts/sdelkadrom (develop|MERGING)
$