Projects information

Chunk

Conflicting content
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.channel.DirectChannel; <<<<<<< HEAD ======= import org.springframework.integration.core.PollableChannel; import org.springframework.integration.file.remote.session.Session; >>>>>>> 7bc4fe2d0b2985b0e775f843b7687546825c75d9 import org.springframework.integration.ftp.TesFtpServer; import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel;

Conflicting content

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.channel.DirectChannel;
<<<<<<< HEAD
=======
import org.springframework.integration.core.PollableChannel;
import org.springframework.integration.file.remote.session.Session;
>>>>>>> 7bc4fe2d0b2985b0e775f843b7687546825c75d9
import org.springframework.integration.ftp.TesFtpServer;
import org.springframework.messaging.Message;
import org.springframework.messaging.PollableChannel;

Solution content
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.ftp.TesFtpServer; import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel;

Solution content

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.file.remote.session.Session;
import org.springframework.integration.ftp.TesFtpServer;
import org.springframework.messaging.Message;
import org.springframework.messaging.PollableChannel;

File
FtpServerOutboundTests.java

Developer's decision
Combination

Kind of conflict
Import

Chunk

Conflicting content
import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.ClassPathXmlApplicationContext; <<<<<<< HEAD import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; ======= import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; import org.springframework.integration.core.PollableChannel; >>>>>>> 7bc4fe2d0b2985b0e775f843b7687546825c75d9 import org.springframework.integration.history.MessageHistory; import org.springframework.integration.jms.JmsMessageDrivenEndpoint; import org.springframework.integration.test.util.TestUtils;

Conflicting content

import org.springframework.beans.DirectFieldAccessor;
import org.springframework.context.support.ClassPathXmlApplicationContext;
<<<<<<< HEAD
import org.springframework.messaging.Message;
import org.springframework.messaging.PollableChannel;
=======
import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.core.PollableChannel;
>>>>>>> 7bc4fe2d0b2985b0e775f843b7687546825c75d9
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.jms.JmsMessageDrivenEndpoint;
import org.springframework.integration.test.util.TestUtils;

Solution content
import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.jms.JmsMessageDrivenEndpoint; import org.springframework.integration.test.util.TestUtils;

Solution content

import org.springframework.beans.DirectFieldAccessor;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.jms.JmsMessageDrivenEndpoint;
import org.springframework.integration.test.util.TestUtils;

File
JmsMessageDrivenChannelAdapterParserTests.java

Developer's decision
None

Kind of conflict
Import

Chunk

Conflicting content
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; import org.springframework.data.redis.connection.RedisConnectionFactory; <<<<<<< HEAD ======= import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; >>>>>>> 7bc4fe2d0b2985b0e775f843b7687546825c75d9 import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.redis.inbound.RedisInboundChannelAdapter; import org.springframework.integration.redis.rules.RedisAvailable;

Conflicting content

import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationContext;
import org.springframework.data.redis.connection.RedisConnectionFactory;
<<<<<<< HEAD
=======
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
>>>>>>> 7bc4fe2d0b2985b0e775f843b7687546825c75d9
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.redis.inbound.RedisInboundChannelAdapter;
import org.springframework.integration.redis.rules.RedisAvailable;

Solution content
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.redis.inbound.RedisInboundChannelAdapter; import org.springframework.integration.redis.rules.RedisAvailable;

Solution content

import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationContext;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.redis.inbound.RedisInboundChannelAdapter;
import org.springframework.integration.redis.rules.RedisAvailable;

File
RedisInboundChannelAdapterParserTests.java

Developer's decision
Combination

Kind of conflict
Import

Chunk

Conflicting content
import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; <<<<<<< HEAD import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; ======= import org.springframework.integration.message.GenericMessage; import org.springframework.integration.sftp.session.SftpFileInfo; import org.springframework.integration.test.util.TestUtils; >>>>>>> 7bc4fe2d0b2985b0e775f843b7687546825c75d9 import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.FileCopyUtils;

Conflicting content

import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.file.remote.session.Session;
import org.springframework.integration.file.remote.session.SessionFactory;
<<<<<<< HEAD
import org.springframework.messaging.Message;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.support.GenericMessage;
=======
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.sftp.session.SftpFileInfo;
import org.springframework.integration.test.util.TestUtils;
>>>>>>> 7bc4fe2d0b2985b0e775f843b7687546825c75d9
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.FileCopyUtils;

Solution content
import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.FileCopyUtils;

Solution content

import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.file.remote.session.Session;
import org.springframework.integration.file.remote.session.SessionFactory;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.messaging.Message;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.FileCopyUtils;

File
SftpServerOutboundTests.java

Developer's decision
Combination

Kind of conflict
Import

Projects >> spring-integration >>ab99c943ab7ac509f9e7435f11309b73cb3cc073