Code synchronization

# Entfernen Sie die folgende Zeile, wenn Sie EDITORCONFIG-Einstellungen von höheren Verzeichnissen vererben möchten.

root = true

# C#-Dateien

[*.cs]

#### Wichtige EditorConfig-Optionen ####

# Einzüge und Abstände

indent_size = 4

indent_style = space

tab_width = 4

# Einstellungen für neue Zeilen

end_of_line = crlf

insert_final_newline = false

#### .NET-Codierungskonventionen ####

# Using-Direktiven organisieren

dotnet_separate_import_directive_groups = true

dotnet_sort_system_directives_first = true

file_header_template = unset

# this.- und Me.-Einstellungen

dotnet_style_qualification_for_event = false

dotnet_style_qualification_for_field = true

dotnet_style_qualification_for_method = false

dotnet_style_qualification_for_property = true

# Einstellungen für Sprachschlüsselwörter und BCL-Typen

dotnet_style_predefined_type_for_locals_parameters_members = true

dotnet_style_predefined_type_for_member_access = true

# Einstellungen für Klammern

dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity

dotnet_style_parentheses_in_other_binary_operators = always_for_clarity

dotnet_style_parentheses_in_other_operators = never_if_unnecessary

dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity

# Einstellungen für Modifizierer

dotnet_style_require_accessibility_modifiers = for_non_interface_members

# Einstellungen für Ausdrucksebene

dotnet_style_coalesce_expression = true

dotnet_style_collection_initializer = true

dotnet_style_explicit_tuple_names = true

dotnet_style_namespace_match_folder = true

dotnet_style_null_propagation = true

dotnet_style_object_initializer = true

dotnet_style_operator_placement_when_wrapping = beginning_of_line

dotnet_style_prefer_auto_properties = true

dotnet_style_prefer_compound_assignment = true

dotnet_style_prefer_conditional_expression_over_assignment = true

dotnet_style_prefer_conditional_expression_over_return = true

dotnet_style_prefer_inferred_anonymous_type_member_names = true

dotnet_style_prefer_inferred_tuple_names = true

dotnet_style_prefer_is_null_check_over_reference_equality_method = true

dotnet_style_prefer_simplified_boolean_expressions = true

dotnet_style_prefer_simplified_interpolation = true

# Einstellungen für Felder

dotnet_style_readonly_field = true

# Einstellungen für Parameter

dotnet_code_quality_unused_parameters = all

# Unterdrückungseinstellungen

dotnet_remove_unnecessary_suppression_exclusions = none

# Einstellungen für neue Zeilen

dotnet_style_allow_multiple_blank_lines_experimental = false:suggestion

dotnet_style_allow_statement_immediately_after_block_experimental = true

#### C#-Codierungskonventionen ####

# Var-Einstellungen

csharp_style_var_elsewhere = false

csharp_style_var_for_built_in_types = false

csharp_style_var_when_type_is_apparent = false

# Ausdruckskörpermember

csharp_style_expression_bodied_accessors = true

csharp_style_expression_bodied_constructors = false

csharp_style_expression_bodied_indexers = true

csharp_style_expression_bodied_lambdas = true

csharp_style_expression_bodied_local_functions = false

csharp_style_expression_bodied_methods = false

csharp_style_expression_bodied_operators = false

csharp_style_expression_bodied_properties = true

csharp_style_namespace_declarations=file_scoped:suggestion

# Einstellungen für den Musterabgleich

csharp_style_pattern_matching_over_as_with_null_check = true

csharp_style_pattern_matching_over_is_with_cast_check = true

csharp_style_prefer_not_pattern = true

csharp_style_prefer_pattern_matching = true

csharp_style_prefer_switch_expression = true

# Einstellungen für NULL-Überprüfung

csharp_style_conditional_delegate_call = true

# Einstellungen für Modifizierer

csharp_prefer_static_local_function = true

csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async

# Einstellungen für Codeblöcke

csharp_prefer_braces = when_multiline

csharp_prefer_simple_using_statement = false

# Einstellungen für Ausdrucksebene

csharp_prefer_simple_default_expression = true

csharp_style_deconstructed_variable_declaration = true

csharp_style_implicit_object_creation_when_type_is_apparent = true

csharp_style_inlined_variable_declaration = true

csharp_style_pattern_local_over_anonymous_function = true

csharp_style_prefer_index_operator = true

csharp_style_prefer_range_operator = true

csharp_style_throw_expression = true

csharp_style_unused_value_assignment_preference = discard_variable

csharp_style_unused_value_expression_statement_preference = discard_variable

# Einstellungen für using-Anweisungen

csharp_using_directive_placement = outside_namespace

# Einstellungen für neue Zeilen

csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true

csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:suggestion

csharp_style_allow_embedded_statements_on_same_line_experimental = false

#### C#-Formatierungsregeln ####

# Einstellungen für neue Zeilen

csharp_new_line_before_catch = true

csharp_new_line_before_else = true

csharp_new_line_before_finally = true

csharp_new_line_before_members_in_anonymous_types = true

csharp_new_line_before_members_in_object_initializers = true

csharp_new_line_before_open_brace = control_blocks,properties,types

csharp_new_line_between_query_expression_clauses = true

# Einstellungen für Einrückung

csharp_indent_block_contents = true

csharp_indent_braces = false

csharp_indent_case_contents = true

csharp_indent_case_contents_when_block = false

csharp_indent_labels = no_change

csharp_indent_switch_labels = true

# Einstellungen für Abstände

csharp_space_after_cast = false

csharp_space_after_colon_in_inheritance_clause = true

csharp_space_after_comma = true

csharp_space_after_dot = false

csharp_space_after_keywords_in_control_flow_statements = true

csharp_space_after_semicolon_in_for_statement = true

csharp_space_around_binary_operators = before_and_after

csharp_space_around_declaration_statements = false

csharp_space_before_colon_in_inheritance_clause = true

csharp_space_before_comma = false

csharp_space_before_dot = false

csharp_space_before_open_square_brackets = false

csharp_space_before_semicolon_in_for_statement = false

csharp_space_between_empty_square_brackets = false

csharp_space_between_method_call_empty_parameter_list_parentheses = false

csharp_space_between_method_call_name_and_opening_parenthesis = false

csharp_space_between_method_call_parameter_list_parentheses = true

csharp_space_between_method_declaration_empty_parameter_list_parentheses = false

csharp_space_between_method_declaration_name_and_open_parenthesis = false

csharp_space_between_method_declaration_parameter_list_parentheses = true

csharp_space_between_parentheses = control_flow_statements,expressions

csharp_space_between_square_brackets = false

# Umbrucheinstellungen

csharp_preserve_single_line_blocks = true

csharp_preserve_single_line_statements = false

#### Benennungsstile ####

# Benennungsregeln

dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion

dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface

dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i

dotnet_naming_rule.types_should_be_pascal_case.severity = silent

dotnet_naming_rule.types_should_be_pascal_case.symbols = types

dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case

dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = silent

dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members

dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case

# Symbolspezifikationen

dotnet_naming_symbols.interface.applicable_kinds = interface

dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected

dotnet_naming_symbols.interface.required_modifiers = 

dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum

dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected

dotnet_naming_symbols.types.required_modifiers = 

dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method

dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected

dotnet_naming_symbols.non_field_members.required_modifiers = 

# Benennungsstile

dotnet_naming_style.pascal_case.required_prefix = 

dotnet_naming_style.pascal_case.required_suffix = 

dotnet_naming_style.pascal_case.word_separator = 

dotnet_naming_style.pascal_case.capitalization = pascal_case

dotnet_naming_style.begins_with_i.required_prefix = I

dotnet_naming_style.begins_with_i.required_suffix = 

dotnet_naming_style.begins_with_i.word_separator = 

dotnet_naming_style.begins_with_i.capitalization = pascal_case

[*.{cs,vb}]

dotnet_diagnostic.CA1822.severity=silent

dotnet_diagnostic.CA1816.severity=silent

 No newline at end of file

    /// </summary>

    /// <param name="fileConflictStrategy"> Specifies how data conflicts should be handled. </param>

    /// <param name="commitOnSuccess"> 'true' to automaticly commit local changes that have been merged before. </param>

    /// <param name="branchName"> The optional branch name.<br/>If not specified current HEAD is used for merging. </param>

    /// <param name="remoteName"> The optional remote name.<br/>If not specified current HEAD is used for merging. </param>

    /// <returns> 'true' if merge action has been processed successfully. </returns>

    public bool Merge( CheckoutFileConflictStrategy fileConflictStrategy = CheckoutFileConflictStrategy.Ours,

                       bool commitOnSuccess = true ) {

                       bool commitOnSuccess = true,

                       string branchName = "",

                       string remoteName = "" ) {

        if ( String.IsNullOrEmpty( this.LocalRepoPath ) )

        {

            GitNotificationContent.Instance.Send( NotificationContentBase.Error + 0000001 );

        {

            using ( Repository repo = new( this.LocalRepoPath ) )

            {

                Branch branch = repo.Head; // String.IsNullOrEmpty( branchName ) ? repo.Head : repo.Branches[branchName];

                //if ( branch == null )                                       // Does branch not exist?

                //    return false;

                Branch? branch = null;

                if ( String.IsNullOrEmpty( remoteName ) )

                    branch = String.IsNullOrEmpty( branchName ) ? repo.Head : repo.Branches[branchName];

                else

                    branch = repo.Branches[$"{remoteName}/{branchName}"];

                if ( branch == null )                                       // Does branch not exist?

                    return false;

                MergeOptions mo = new() {

                    FastForwardStrategy = FastForwardStrategy.NoFastForward,

            if ( !Checkout( "main" ) )

                return false;

            if ( !Merge( CheckoutFileConflictStrategy.Theirs, true ) )

            if ( !Merge( CheckoutFileConflictStrategy.Theirs, true, "main", "upstream" ) )

                return false;

            if ( !Push( "main", "Upstream synchronization", force: true ) )

                return false;