We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 6482bb7 commit eed55ecCopy full SHA for eed55ec
conflict_mediator/download.py
@@ -36,6 +36,10 @@ def create_or_update_file(
36
37
38
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
+
43
commits_str = run_command(
44
["git", "log", "--reverse", "--pretty=format:%h"], verbose
45
)
@@ -44,10 +48,6 @@ def setup(verbose: bool = False):
48
tag_name = f"git-mastery-start-{first_commit}"
49
run_command(["git", "tag", tag_name], verbose)
46
50
47
- create_or_update_file("script.py", "print('Hello ...')")
- run_command(["git", "add", "script.py"], verbose)
- run_command(["git", "commit", "-m", "Add base script.py"], verbose)
-
51
run_command(["git", "checkout", "-b", "A"], verbose)
52
create_or_update_file("script.py", "print('Hello World!')")
53
run_command(["git", "add", "script.py"], verbose)
0 commit comments