git里head冲突内容

<<<<<<< HEAD
        
            
			
			
			
			
               
                   
                   
                
          
		
=======
        
            
            com.project.scenic
            proto_api
            1.0.4-SNAPSHOT
            
                
                    cglib
                    cglib
                
            
        
>>>>>>> release20181120

<<<<<<
=========到 >>>>release20181120里的内容是从远程分支pull下来的内容

你可能感兴趣的:(git)