On Tue, Sep 09, 2014 at 06:48:31PM +0000, John Maher wrote: > Hello > > Just wondering if anyone may have an idea how my repository got so buggered > up. I tried to merge a branch to the trunk and received 49 conflicts. 2 are > files that do not need to be tracked so that leaves 47. Out of the 47 there > are two problems, local add, incoming add upon merge & local delete, incoming > delete upon merge. I was doing some code cleanup so it is possible I deleted > the files in two different branches. But I know for certain that I did not > create the same file twice. I did a diff on the first one and it is > identical in both branches, easy to fix, difficult to determine how the > conflict came about. The second file is different, I deleted dome code that > is not needed anymore. More work to fix. With the conflict it causes the > merge to fail thus making this much more time consuming to fix. The question > I have is anyone know what I could've done to create these false conflicts? >
What are the parameters you used to run this merge? At first glance this looks like your merge source and target are at non-corresponding levels in the tree, e.g. as if you merged from ^/branches/mybranch to ^/trunk/some/subdir/of/trunk > Result of the merge: > --- Merging r222 through r235 into '.': > C RotairAO_SupplierManufacturer\SupplierManufacturerTranslate.vb > C RotairAO_SupplierManufacturer\SupplierManufacturerController.vb > C IntuitiveUI_ItemCard_CUSTOM\CopyItem.vb > C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.resx > C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.designer.vb > C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.vb > C IntuitiveUI_ItemCard_CUSTOM\ItemCard.resx > C IntuitiveUI_ItemCard_CUSTOM\CopyItem.resx > C IntuitiveUI_ItemCard_CUSTOM\ItemCard.Designer.vb > C IntuitiveUI_ItemCard_CUSTOM\CopyItem.Designer.vb > C IntuitiveUI_ItemCard_CUSTOM\ItemCard.vb > C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.Designer.vb > C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.vb > C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.resx > C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.resx > C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.Designer.vb > C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.vb > C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.Designer.vb > C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.vb > C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.resx > A IntuitiveUI_SalesOrder_CUSTOM\SalesOrder.resx > A IntuitiveUI_SalesOrder_CUSTOM\SalesOrder.Designer.vb > A IntuitiveUI_SalesOrder_CUSTOM\SalesOrder.vb > C RotairUI_SupplierManufacturer\app.config > C Rotair_Excel\Schema.resx > C Rotair_Excel\Schema.Designer.vb > C Rotair_Excel\Schema.vb > C RotairAO_RFQ\RFQVendorCharge.vb > A RotairAO_RFQ\RFQImaging OLD.vb > C RotairAO_RFQ\RFQVendorQuote.vb > C RotairAO_RFQ\RFQImagingController.vb > A RotairAO_RFQ\RFQUnindexed OLD.vb > C RotairAO_RFQ\RFQsEmailed.vb > C RotairAO_RFQ\RFQUnindexedController.vb > C RotairAO_RFQ\RFQMaster.vb > C RotairAO_RFQ\RFQVendor.vb > C RotairAO_RFQ\RFQItemQuantity.vb > C RotairAO_RFQ\RFQItem.vb > C RotairAO_RFQ\IO.vb > C Rotair_System\File.vb > --- Merging r222 through r235 into 'RotairUI_Email': > C RotairUI_Email\NewMessage.Designer.vb > C RotairUI_Email\NewMessage.vb > C RotairUI_Email\NewMessage.resx > --- Merging r222 through r235 into '.': > C RotairUI_RFQ\UnenteredVendorDialog.resx > C RotairUI_RFQ\Resources > C RotairUI_RFQ\UnenteredVendorDialog.Designer.vb > C RotairUI_RFQ\UnenteredVendorDialog.vb > C RotairUI_RFQ\RotairUI_RFQ.vbproj.user > C RotairUI_RFQ\RotairUI_RFQ.suo > C RotairDataAccess\DomainWorkOrder.vb > C RotairDataAccess_Wrapper\DomainShipping.vb > C RotairDialog_Screening\SelectVendor.Designer.vb > C RotairDialog_Screening\SelectVendor.vb > C RotairDialog_Screening\SelectVendor.resx > --- Recording mergeinfo for merge of r222 through r235 into '.': > U . > --- Recording mergeinfo for merge of r222 through r235 into 'RotairUI_Email': > U RotairUI_Email > Summary of conflicts: > Tree conflicts: 49 > > Status of the files: > C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C IntuitiveUI_ItemCard_CUSTOM\ItemCard.resx > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C IntuitiveUI_ItemCard_CUSTOM\CopyItem.resx > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C IntuitiveUI_ItemCard_CUSTOM\ItemCard.Designer.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C IntuitiveUI_ItemCard_CUSTOM\CopyItem.Designer.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C IntuitiveUI_ItemCard_CUSTOM\ItemCard.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > ! C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.Designer.vb > > local delete, incoming delete upon merge > Summary of conflicts: > Tree conflicts: 1 > ! C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.vb > > local delete, incoming delete upon merge > Summary of conflicts: > Tree conflicts: 1 > ! C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.resx > > local delete, incoming delete upon merge > Summary of conflicts: > Tree conflicts: 1 > ! C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.resx > > local delete, incoming delete upon merge > Summary of conflicts: > Tree conflicts: 1 > ! C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.Designer.vb > > local delete, incoming delete upon merge > Summary of conflicts: > Tree conflicts: 1 > ! C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.vb > > local delete, incoming delete upon merge > Summary of conflicts: > Tree conflicts: 1 > ! C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.Designer.vb > > local delete, incoming delete upon merge > Summary of conflicts: > Tree conflicts: 1 > ! C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.vb > > local delete, incoming delete upon merge > Summary of conflicts: > Tree conflicts: 1 > ! C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.resx > > local delete, incoming delete upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairUI_SupplierManufacturer\app.config > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C Rotair_Excel\Schema.resx > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C Rotair_Excel\Schema.Designer.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C Rotair_Excel\Schema.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairAO_RFQ\RFQVendorCharge.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairAO_RFQ\RFQVendorQuote.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairAO_RFQ\RFQImagingController.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairAO_RFQ\RFQsEmailed.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairAO_RFQ\RFQUnindexedController.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairAO_RFQ\RFQMaster.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairAO_RFQ\RFQVendor.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairAO_RFQ\RFQItemQuantity.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairAO_RFQ\RFQItem.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairAO_RFQ\IO.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C Rotair_System\File.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairUI_Email\NewMessage.Designer.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairUI_Email\NewMessage.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairUI_Email\NewMessage.resx > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairUI_RFQ\UnenteredVendorDialog.resx > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairUI_RFQ\Resources > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairUI_RFQ\UnenteredVendorDialog.Designer.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairUI_RFQ\UnenteredVendorDialog.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairDataAccess\DomainWorkOrder.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairDataAccess_Wrapper\DomainShipping.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairDialog_Screening\SelectVendor.Designer.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairDialog_Screening\SelectVendor.vb > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > C RotairDialog_Screening\SelectVendor.resx > > local add, incoming add upon merge > Summary of conflicts: > Tree conflicts: 1 > > JM >
