better

prompts.py

@@ -16,19 +16,74 @@ new lines to replace
 the original chunk
 >>>>>>> UPDATED
 
-Here is an example for how to JUST add lines to a file, without altering any existing lines.
+example.py
-This anchors the location of the new code in the file by including a few DISTINCTIVE lines from the original file.
-
-foo.py
 <<<<<<< ORIGINAL
-    result = cam.cnt()
+def subtract(x, y):
-    return result
+    return x - y
-=======
-    result = cam.cnt()
-    return result
 
-def bar(b):
+# Function to multiply two numbers
-    return b*b*b
+def multiply(x, y):
+    return x * y
+
+=======
+def subtract(x, y):
+    return x - y
+
+# Function to multiply two numbers!
+def multiply(x, y):
+    return x * y
+
+>>>>>>> UPDATED
+
+example.py
+<<<<<<< ORIGINAL
+def square_root(x):
+    return x ** 0.5
+
+# Main function
+def main():
+    print("Welcome to the calculator program!")
+    print("Please select an operation:")
+=======
+def square_root(x):
+    return x ** 0.5
+
+def main():
+    print("Welcome to the calculator program!")
+    print("Please select an operation:")
+>>>>>>> UPDATED
+
+example.py
+<<<<<<< ORIGINAL
+    print("5. Power")
+    print("6. Square Root")
+
+    # Take input from the user
+    choice = input("Enter choice (1/2/3/4/5/6): ")
+
+    # Check if choice is one of the options
+=======
+    print("5. Power")
+    print("6. Square Root")
+
+    # this is the main input
+    # where the user gets to choose
+    choice = input("Enter choice (1/2/3/4/5/6): ")
+
+    # Check if choice is one of the options
+>>>>>>> UPDATED
+
+example.py
+<<<<<<< ORIGINAL
+# Call the main function
+if __name__ == '__main__':
+    main()
+=======
+# Call the main function
+if __name__ == '__main__':
+    main()
+
+# the end
 >>>>>>> UPDATED
 '''
 
@@ -42,9 +97,22 @@ files_content_suffix = ''
 
 user_suffix = '''
 
-YOU CAN ONLY EDIT THE FILES I PROVIDED ABOVE!
+BASE YOUR EDITS ON THE CURRENT CONTENTS OF THE FILES AS SHOWN IN THIS MESSAGE.
-NEVER INCLUDE AN ENTIRE FILE IN YOUR REPLY!
+
-TO SPECIFY CODE CHANGES YOU MUST USE THE ORIGINAL/UPDATED EDIT COMMANDS!
+NEVER RETURN CODE LIKE THIS:
+
+```
+file contents
+...
+```
+
+NEVER RETURN CODE LIKE THIS:
+
+filename.ext
+```
+file contents
+...
+```
 '''
 
 ### EDITOR