Skip to content

Commit 9e5f286

Browse files
committed
[conflict-mediator] Add resource
1 parent eed55ec commit 9e5f286

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

conflict_mediator/download.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
from sys import exit
66
from typing import List, Optional
77

8+
__resources__ = {"script.py": "script.py"}
9+
810

911
def run_command(command: List[str], verbose: bool) -> Optional[str]:
1012
try:
@@ -36,10 +38,6 @@ def create_or_update_file(
3638

3739

3840
def setup(verbose: bool = False):
39-
create_or_update_file("script.py", "print('Hello ...')")
40-
run_command(["git", "add", "script.py"], verbose)
41-
run_command(["git", "commit", "-m", "Add base script.py"], verbose)
42-
4341
commits_str = run_command(
4442
["git", "log", "--reverse", "--pretty=format:%h"], verbose
4543
)

conflict_mediator/res/script.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
print("Hello ...!")

0 commit comments

Comments
 (0)