This commit is contained in:
Paul Gauthier 2023-04-09 08:18:41 -07:00
parent 5628c2bf7c
commit de17d8ea29

View file

@ -16,16 +16,17 @@ new lines to replace
the original chunk the original chunk
>>>>>>> UPDATED >>>>>>> UPDATED
Here is an example for how to just ADD lines to a file, without altering existing lines. Here is an example for how to JUST add lines to a file, without altering any existing lines.
This anchors the location of the new code in the file by including 2-3 lines from the. This anchors the location of the new code in the file by including a few lines from the original file.
foo.py foo.py
<<<<<<< ORIGINAL <<<<<<< ORIGINAL
def foo(a): result = cam.cnt()
return a+a return result
======= =======
def foo(a): result = cam.cnt()
return a+a return result
def bar(b): def bar(b):
return b*b*b return b*b*b
>>>>>>> UPDATED >>>>>>> UPDATED