Class: Aws::Types::DescribeMergeConflictsInput

Inherits:
Object
  • Object
show all
Defined in:
sig/types.rbs

Constant Summary collapse

SENSITIVE =

Returns:

  • ([]) 

      
    

  




  
Instance Attribute Summary collapse

  





  

    
Instance Attribute Details

    
      
      
      

  

  
    #conflict_detail_level  ⇒ "FILE_LEVEL", "LINE_LEVEL" 
  

  

  


  

    
Returns the value of attribute conflict_detail_level.


  





  

Returns:


    
  
    
  • 
      
      
        ("FILE_LEVEL", "LINE_LEVEL")
      
      
      
    
    • 
  





  

    
      


558
559
560

    		
    
      
# File 'sig/types.rbs', line 558

def conflict_detail_level
  @conflict_detail_level
end

    		
  





    
      
      
      

  

  
    #conflict_resolution_strategy  ⇒ "NONE", ... 
  

  

  


  

    
Returns the value of attribute conflict_resolution_strategy.


  





  

Returns:


    
  
    
  • 
      
      
        ("NONE", "ACCEPT_SOURCE", "ACCEPT_DESTINATION", "AUTOMERGE")
      
      
      
    
    • 
  





  

    
      


559
560
561

    		
    
      
# File 'sig/types.rbs', line 559

def conflict_resolution_strategy
  @conflict_resolution_strategy
end

    		
  





    
      
      
      

  

  
    #destination_commit_specifier  ⇒ ::String 
  

  

  


  

    
Returns the value of attribute destination_commit_specifier.


  





  

Returns:


    
  
    
  • 
      
      
        (::String)
      
      
      
    
    • 
  





  

    
      


553
554
555

    		
    
      
# File 'sig/types.rbs', line 553

def destination_commit_specifier
  @destination_commit_specifier
end

    		
  





    
      
      
      

  

  
    #file_path  ⇒ ::String 
  

  

  


  

    
Returns the value of attribute file_path.


  





  

Returns:


    
  
    
  • 
      
      
        (::String)
      
      
      
    
    • 
  





  

    
      


557
558
559

    		
    
      
# File 'sig/types.rbs', line 557

def file_path
  @file_path
end

    		
  





    
      
      
      

  

  
    #max_merge_hunks  ⇒ ::Integer 
  

  

  


  

    
Returns the value of attribute max_merge_hunks.


  





  

Returns:


    
  
    
  • 
      
      
        (::Integer)
      
      
      
    
    • 
  





  

    
      


556
557
558

    		
    
      
# File 'sig/types.rbs', line 556

def max_merge_hunks
  @max_merge_hunks
end

    		
  





    
      
      
      

  

  
    #merge_option  ⇒ "FAST_FORWARD_MERGE", ... 
  

  

  


  

    
Returns the value of attribute merge_option.


  





  

Returns:


    
  
    
  • 
      
      
        ("FAST_FORWARD_MERGE", "SQUASH_MERGE", "THREE_WAY_MERGE")
      
      
      
    
    • 
  





  

    
      


555
556
557

    		
    
      
# File 'sig/types.rbs', line 555

def merge_option
  @merge_option
end

    		
  





    
      
      
      

  

  
    #next_token  ⇒ ::String 
  

  

  


  

    
Returns the value of attribute next_token.


  





  

Returns:


    
  
    
  • 
      
      
        (::String)
      
      
      
    
    • 
  





  

    
      


560
561
562

    		
    
      
# File 'sig/types.rbs', line 560

def next_token
  @next_token
end

    		
  





    
      
      
      

  

  
    #repository_name  ⇒ ::String 
  

  

  


  

    
Returns the value of attribute repository_name.


  





  

Returns:


    
  
    
  • 
      
      
        (::String)
      
      
      
    
    • 
  





  

    
      


552
553
554

    		
    
      
# File 'sig/types.rbs', line 552

def repository_name
  @repository_name
end

    		
  





    
      
      
      

  

  
    #source_commit_specifier  ⇒ ::String 
  

  

  


  

    
Returns the value of attribute source_commit_specifier.


  





  

Returns:


    
  
    
  • 
      
      
        (::String)
      
      
      
    
    • 
  





  

    
      


554
555
556

    		
    
      
# File 'sig/types.rbs', line 554

def source_commit_specifier
  @source_commit_specifier
end