Когда я запускаю git merge master, вот что я получаю:
➜ billing git:(issue-103) git merge master
Auto-merging src/locales/en/translation.json
CONFLICT (content): Merge conflict in src/locales/en/translation.json
Removing src/client/pages/Shipments/scss/main.scss
Removing src/client/pages/Shipments/scss/blocks/_table.scss
CONFLICT (modify/delete): src/client/pages/Shipments/scss/blocks/_modal.scss deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/scss/blocks/_modal.scss left in tree.
Removing src/client/pages/Shipments/scss/blocks/_itemsTable.scss
CONFLICT (modify/delete): src/client/pages/Shipments/scss/blocks/_filtersBar.scss deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/scss/blocks/_filtersBar.scss left in tree.
Removing src/client/pages/Shipments/reducers/index.js
Auto-merging src/client/pages/Shipments/index.js
CONFLICT (content): Merge conflict in src/client/pages/Shipments/index.js
Removing src/client/pages/Shipments/containers/GraphQLQuery.js
Removing src/client/pages/Shipments/containers/GetShipmentsAddresses.js
CONFLICT (modify/delete): src/client/pages/Shipments/containers/GetShipments.js deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/containers/GetShipments.js left in tree.
Removing src/client/pages/Shipments/containers/GetAllShipmentTypes.js
Removing src/client/pages/Shipments/containers/GetAllShipmentStatuses.js
Removing src/client/pages/Shipments/containers/GetAllCouriers.js
Removing src/client/pages/Shipments/constants/ActionTypes.js
Removing src/client/pages/Shipments/actions/shipments.js
Removing src/client/pages/Shipments/actions/index.js
CONFLICT (modify/delete): src/client/pages/Shipments/TableToolbarComp.js deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/TableToolbarComp.js left in tree.
Removing src/client/pages/Shipments/TableItemsHeaders.js
Removing src/client/pages/Shipments/TableItemsHeader.js
Removing src/client/pages/Shipments/TableHeaders.js
CONFLICT (modify/delete): src/client/pages/Shipments/TableExpandedRowWrapper.js deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/TableExpandedRowWrapper.js left in tree.
Removing src/client/pages/Shipments/TableExpandedRow.js
Removing src/client/pages/Shipments/TableEmptyState.js
CONFLICT (modify/delete): src/client/pages/Shipments/ShipmentsTable.js deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/ShipmentsTable.js left in tree.
CONFLICT (modify/delete): src/client/pages/Shipments/FiltersModal.js deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/FiltersModal.js left in tree.
Automatic merge failed; fix conflicts and then commit the result.
Как видите, он удаляет много нужных мне файлов, которые я только что подтвердил, перед тем как объединить мастер с моей веткой issue-30.
Любопытно, что если я зайду на master, папка shipments, в которой я разрабатываю некоторые компоненты, будет пустой.
Так что все файлы с надписью Removing не должны быть удалены.
Итак, что может быть причиной удаления этих файлов?