Projects >> ClearCaseUCMPlugin >>706cf3d91f3c8eafce926b534d00f88211fbb134

Chunk
Conflicting content
        
        System.out.println( " * Slave          : " + slave.getSelfLabel().getName() );
		System.out.println( "============================================" );
<<<<<<< HEAD

		this.scm = scm = new CCUCMScm( component, promotionLevel, "ALL", false, type, stream, "successful", createBaseline, template, forceDeliver, recommend, tag, description, "", true, false );
=======
		// boolean createBaseline, String nameTemplate, boolean forceDeliver, boolean recommend, boolean makeTag, boolean setDescription
		//CCUCMScm scm = new CCUCMScm( component, "INITIAL", "ALL", false, type, stream, "successful", createBaseline, "[project]_build_[number]", forceDeliver, recommend, tag, description, "jenkins" );
		CCUCMScm scm = new CCUCMScm( component, promotionLevel, "ALL", false, type, stream, "successful", createBaseline, template, forceDeliver, recommend, tag, description, "", true, false, false );
		this.scm = scm;
>>>>>>> c6e44f7c3188ffed83aaefdd43f982e911c38ca1
        
		project.setScm( this.scm );
		
Solution content
        
        System.out.println( " * Slave          : " + slave.getSelfLabel().getName() );
		System.out.println( "============================================" );
        
		this.scm = new CCUCMScm( component, promotionLevel, "ALL", false, type, stream, "successful", createBaseline, template, forceDeliver, recommend, tag, description, "", true, false, false);
		project.setScm( this.scm );
		
File
CCUCMRule.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
Method invocation
Variable