Projects >> atlas >>12d87d4c64f2b5d57a14a58af78267c54dc47ab2

Chunk
Conflicting content 
            Sets.union(ImmutableSet.of(PREVIEW_NETWORKS, BBC_REDUX, RADIO_TIMES, LOVEFILM, NETFLIX, YOUVIEW), musicPublishers)
        );
        
<<<<<<< HEAD
        EquivalenceUpdater standardItemUpdater = standardItemUpdater(acceptablePublishers, 
            ImmutableSet.of(new TitleMatchingItemScorer(), new SequenceItemScorer()));
        EquivalenceUpdater standardContainerUpdater = standardContainerUpdater(acceptablePublishers);
=======
        EquivalenceUpdater standardItemUpdater = standardItemUpdater(acceptablePublishers);
        EquivalenceUpdater topLevelContainerUpdater = topLevelContainerUpdater(acceptablePublishers);
>>>>>>> 47f22a4f6b0b87c454e514063de630291ec16569

        Set nonStandardPublishers = Sets.union(ImmutableSet.of(ITUNES, BBC_REDUX, RADIO_TIMES, FACEBOOK, LOVEFILM, NETFLIX, YOUVIEW, TALK_TALK), musicPublishers);
        final EquivalenceUpdaters updaters = new EquivalenceUpdaters();
Solution content 
            Sets.union(ImmutableSet.of(PREVIEW_NETWORKS, BBC_REDUX, RADIO_TIMES, LOVEFILM, NETFLIX, YOUVIEW), musicPublishers)
        );
        
        EquivalenceUpdater standardItemUpdater = standardItemUpdater(acceptablePublishers, 
            ImmutableSet.of(new TitleMatchingItemScorer(), new SequenceItemScorer()));
        EquivalenceUpdater topLevelContainerUpdater = topLevelContainerUpdater(acceptablePublishers);

        Set nonStandardPublishers = Sets.union(ImmutableSet.of(ITUNES, BBC_REDUX, RADIO_TIMES, FACEBOOK, LOVEFILM, NETFLIX, YOUVIEW, TALK_TALK), musicPublishers);
        final EquivalenceUpdaters updaters = new EquivalenceUpdaters();
File
EquivModule.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                .build());
        
        Set youViewPublishers = Sets.union(acceptablePublishers, ImmutableSet.of(YOUVIEW));
<<<<<<< HEAD
        updaters.register(YOUVIEW, Item.class, broadcastItemEquivalenceUpdater(youViewPublishers, Score.negativeOne()));
        updaters.register(YOUVIEW, Container.class, broadcastItemContainerEquivalenceUpdater(youViewPublishers));

        Set reduxPublishers = Sets.union(acceptablePublishers, ImmutableSet.of(BBC_REDUX));

        updaters.register(BBC_REDUX, Item.class, broadcastItemEquivalenceUpdater(reduxPublishers, Score.nullScore()));
        updaters.register(BBC_REDUX, Container.class, broadcastItemContainerEquivalenceUpdater(reduxPublishers));
=======
        updaters.register(YOUVIEW, SourceSpecificEquivalenceUpdater.builder(YOUVIEW)
                .withItemUpdater(broadcastItemEquivalenceUpdater(youViewPublishers))
                .withTopLevelContainerUpdater(broadcastItemContainerEquivalenceUpdater(youViewPublishers))
                .withNonTopLevelContainerUpdater(NullEquivalenceUpdater.get())
                .build());

        Set reduxPublishers = Sets.union(acceptablePublishers, ImmutableSet.of(BBC_REDUX));

        updaters.register(BBC_REDUX, SourceSpecificEquivalenceUpdater.builder(BBC_REDUX)
                .withItemUpdater(broadcastItemEquivalenceUpdater(reduxPublishers))
                .withTopLevelContainerUpdater(broadcastItemContainerEquivalenceUpdater(reduxPublishers))
                .withNonTopLevelContainerUpdater(NullEquivalenceUpdater.get())
                .build());
>>>>>>> 47f22a4f6b0b87c454e514063de630291ec16569
        
        Set facebookAcceptablePublishers = Sets.union(acceptablePublishers, ImmutableSet.of(FACEBOOK));
        updaters.register(FACEBOOK, SourceSpecificEquivalenceUpdater.builder(FACEBOOK)
Solution content 
                .build());
        
        Set youViewPublishers = Sets.union(acceptablePublishers, ImmutableSet.of(YOUVIEW));
        updaters.register(YOUVIEW, SourceSpecificEquivalenceUpdater.builder(YOUVIEW)
                .withItemUpdater(broadcastItemEquivalenceUpdater(youViewPublishers, Score.negativeOne()))
                .withTopLevelContainerUpdater(broadcastItemContainerEquivalenceUpdater(youViewPublishers))
                .withNonTopLevelContainerUpdater(NullEquivalenceUpdater.get())
                .build());

        Set reduxPublishers = Sets.union(acceptablePublishers, ImmutableSet.of(BBC_REDUX));

        updaters.register(BBC_REDUX, SourceSpecificEquivalenceUpdater.builder(BBC_REDUX)
                .withItemUpdater(broadcastItemEquivalenceUpdater(reduxPublishers, Score.nullScore()))
                .withTopLevelContainerUpdater(broadcastItemContainerEquivalenceUpdater(reduxPublishers))
                .withNonTopLevelContainerUpdater(NullEquivalenceUpdater.get())
                .build());
        
        Set facebookAcceptablePublishers = Sets.union(acceptablePublishers, ImmutableSet.of(FACEBOOK));
        updaters.register(FACEBOOK, SourceSpecificEquivalenceUpdater.builder(FACEBOOK)
File
EquivModule.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable