Skip to content

Commit

Permalink
Removed some pylint stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Benedikt Schesch committed May 19, 2024
1 parent 5ad0469 commit 1a00b64
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/scripts/merge_tools/resolve-conflicts.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python # pylint: skip-file
#! /usr/bin/env python
# -*- coding: utf-8 -*-

# This is a helper script for `resolve-adjacent-conflicts` and
Expand Down Expand Up @@ -39,7 +39,7 @@
debug = False


def main(): # pylint: disable=too-many-locals
def main():
"""The main entry point."""
arg_parser = ArgumentParser()
arg_parser.add_argument("filename")
Expand Down Expand Up @@ -114,7 +114,7 @@ def main(): # pylint: disable=too-many-locals
sys.exit(0)


def looking_at_conflict( # pylint: disable=too-many-return-statements
def looking_at_conflict(
filename: str, start_index: int, lines: List[str]
) -> Union[None, Tuple[List[str], List[str], List[str], int]]:
"""Tests whether the following text starts a conflict.
Expand Down Expand Up @@ -185,7 +185,7 @@ def looking_at_conflict( # pylint: disable=too-many-return-statements
return (base, parent1, parent2, index - start_index)


def merge( # pylint: disable=too-many-arguments
def merge(
base: List[str],
parent1: List[str],
parent2: List[str],
Expand Down

0 comments on commit 1a00b64

Please sign in to comment.