Skip to content

Commit eed55ec

Browse files
committed
[conflict-mediator] Fix download
1 parent 6482bb7 commit eed55ec

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

conflict_mediator/download.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ def create_or_update_file(
3636

3737

3838
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+
3943
commits_str = run_command(
4044
["git", "log", "--reverse", "--pretty=format:%h"], verbose
4145
)
@@ -44,10 +48,6 @@ def setup(verbose: bool = False):
4448
tag_name = f"git-mastery-start-{first_commit}"
4549
run_command(["git", "tag", tag_name], verbose)
4650

47-
create_or_update_file("script.py", "print('Hello ...')")
48-
run_command(["git", "add", "script.py"], verbose)
49-
run_command(["git", "commit", "-m", "Add base script.py"], verbose)
50-
5151
run_command(["git", "checkout", "-b", "A"], verbose)
5252
create_or_update_file("script.py", "print('Hello World!')")
5353
run_command(["git", "add", "script.py"], verbose)

0 commit comments

Comments
 (0)