Projects >> raven-java >>22b1c3618d9237f3bd0899ce5da45bb85658420b

Chunk
Conflicting content 
        @SuppressWarnings("unchecked")
        Map properties = (Map) loggingEvent.getProperties();
<<<<<<< HEAD
        for (Map.Entry mdcEntry : properties.entrySet()) {
            if (extraTags.contains(mdcEntry.getKey())) {
                eventBuilder.addTag(mdcEntry.getKey(), mdcEntry.getValue().toString());
            } else {
                eventBuilder.addExtra(mdcEntry.getKey(), mdcEntry.getValue());
            }
        }
=======
        for (Map.Entry mdcEntry : properties.entrySet())
            eventBuilder.withExtra(mdcEntry.getKey(), mdcEntry.getValue());
>>>>>>> 425d6d16818c4b75151deff33b3d2f42aaea6f1e

        for (Map.Entry tagEntry : tags.entrySet())
            eventBuilder.withTag(tagEntry.getKey(), tagEntry.getValue());
Solution content 
        @SuppressWarnings("unchecked")
        Map properties = (Map) loggingEvent.getProperties();
        for (Map.Entry mdcEntry : properties.entrySet()) {
            if (extraTags.contains(mdcEntry.getKey())) {
                eventBuilder.withTag(mdcEntry.getKey(), mdcEntry.getValue().toString());
            } else {
                eventBuilder.withExtra(mdcEntry.getKey(), mdcEntry.getValue());
            }
        }

        for (Map.Entry tagEntry : tags.entrySet())
            eventBuilder.withTag(tagEntry.getKey(), tagEntry.getValue());
File
SentryAppender.java
Developer's decision
Manual
Kind of conflict
For statement
Chunk
Conflicting content 
        if (event.getContextMap() != null) {
            for (Map.Entry mdcEntry : event.getContextMap().entrySet()) {
<<<<<<< HEAD
                if (extraTags.contains(mdcEntry.getKey())) {
                    eventBuilder.addTag(mdcEntry.getKey(), mdcEntry.getValue());
                } else {
                    eventBuilder.addExtra(mdcEntry.getKey(), mdcEntry.getValue());
                }
=======
                eventBuilder.withExtra(mdcEntry.getKey(), mdcEntry.getValue());
>>>>>>> 425d6d16818c4b75151deff33b3d2f42aaea6f1e
            }
        }
Solution content 
        if (event.getContextMap() != null) {
            for (Map.Entry mdcEntry : event.getContextMap().entrySet()) {
                if (extraTags.contains(mdcEntry.getKey())) {
                    eventBuilder.withTag(mdcEntry.getKey(), mdcEntry.getValue());
                } else {
                    eventBuilder.withExtra(mdcEntry.getKey(), mdcEntry.getValue());
                }
            }
        }
File
SentryAppender.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
        }

        for (Map.Entry mdcEntry : iLoggingEvent.getMDCPropertyMap().entrySet()) {
<<<<<<< HEAD
            if (extraTags.contains(mdcEntry.getKey())) {
                eventBuilder.addTag(mdcEntry.getKey(), mdcEntry.getValue());
            } else {
                eventBuilder.addExtra(mdcEntry.getKey(), mdcEntry.getValue());
            }
=======
            eventBuilder.withExtra(mdcEntry.getKey(), mdcEntry.getValue());
>>>>>>> 425d6d16818c4b75151deff33b3d2f42aaea6f1e
        }

        if (iLoggingEvent.getMarker() != null)
Solution content 
        }

        for (Map.Entry mdcEntry : iLoggingEvent.getMDCPropertyMap().entrySet()) {
            if (extraTags.contains(mdcEntry.getKey())) {
                eventBuilder.withTag(mdcEntry.getKey(), mdcEntry.getValue());
            } else {
                eventBuilder.withExtra(mdcEntry.getKey(), mdcEntry.getValue());
            }
        }

        if (iLoggingEvent.getMarker() != null)
File
SentryAppender.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation