Projects information

Chunk

Conflicting content
<<<<<<< HEAD // Source project: sip01, branch: 04 (Maven Project) ======= /* * Copyright (c) 2013 Manning Publications Co. * * Book: http://manning.com/wheeler/ * Blog: http://springinpractice.com/ * Code: https://github.com/springinpractice */ >>>>>>> 149e5eb8b5815005f4040caf463f5e06c509cdf9 package com.springinpractice.ch01.dao; import java.util.List;

Conflicting content

<<<<<<< HEAD
// Source project: sip01, branch: 04 (Maven Project)
=======
/* 
 * Copyright (c) 2013 Manning Publications Co.
 * 
 * Book: http://manning.com/wheeler/
 * Blog: http://springinpractice.com/
 * Code: https://github.com/springinpractice
 */
>>>>>>> 149e5eb8b5815005f4040caf463f5e06c509cdf9
package com.springinpractice.ch01.dao;

import java.util.List;

Solution content
/* * Copyright (c) 2013 Manning Publications Co. * * Book: http://manning.com/wheeler/ * Blog: http://springinpractice.com/ * Code: https://github.com/springinpractice */ package com.springinpractice.ch01.dao; import java.util.List;

Solution content

/* 
 * Copyright (c) 2013 Manning Publications Co.
 * 
 * Book: http://manning.com/wheeler/
 * Blog: http://springinpractice.com/
 * Code: https://github.com/springinpractice
 */
package com.springinpractice.ch01.dao;

import java.util.List;

File
AccountDao.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content
import com.springinpractice.ch01.model.Account; public interface AccountDao { <<<<<<< HEAD List findAll() throws Exception; ======= >>>>>>> 149e5eb8b5815005f4040caf463f5e06c509cdf9 }

Solution content
import com.springinpractice.ch01.model.Account; public interface AccountDao { List findAll() throws Exception; }

File
AccountDao.java

Developer's decision
Version 1

Kind of conflict
Method interface

Chunk

Conflicting content
<<<<<<< HEAD // Source project: sip01, branch: 04 (Maven Project) ======= /* * Copyright (c) 2013 Manning Publications Co. * * Book: http://manning.com/wheeler/ * Blog: http://springinpractice.com/ * Code: https://github.com/springinpractice */ >>>>>>> 149e5eb8b5815005f4040caf463f5e06c509cdf9 package com.springinpractice.ch01.dao.jdbc; import java.util.List;

Conflicting content

<<<<<<< HEAD
// Source project: sip01, branch: 04 (Maven Project)
=======
/* 
 * Copyright (c) 2013 Manning Publications Co.
 * 
 * Book: http://manning.com/wheeler/
 * Blog: http://springinpractice.com/
 * Code: https://github.com/springinpractice
 */
>>>>>>> 149e5eb8b5815005f4040caf463f5e06c509cdf9
package com.springinpractice.ch01.dao.jdbc;

import java.util.List;

Solution content
/* * Copyright (c) 2013 Manning Publications Co. * * Book: http://manning.com/wheeler/ * Blog: http://springinpractice.com/ * Code: https://github.com/springinpractice */ package com.springinpractice.ch01.dao.jdbc; import java.util.List;

Solution content

/* 
 * Copyright (c) 2013 Manning Publications Co.
 * 
 * Book: http://manning.com/wheeler/
 * Blog: http://springinpractice.com/
 * Code: https://github.com/springinpractice
 */
package com.springinpractice.ch01.dao.jdbc;

import java.util.List;

File
JdbcAccountDao.java

Developer's decision
Version 2

Kind of conflict
Comment

Projects >> sip01 >>81a08460ece89a851d0e04e369532847869f2fa2