问题描述
def main():
<<<<<<< HEAD
print("Start of program>>>>>>>")
=======
print("End of program!")
>>>>>>> improvement-to-the-code
main()
解决方法
发生的事情是main()
中发生的事情有两个版本:
第一个版本HEAD
分支:
<<<<<<< HEAD
# Relevant code of `HEAD` branch below [START]
print("Start of program>>>>>>>")
# Relevant code of `HEAD` branch above [END]
=======
第二个版本improvement-to-the-code
分支:
=======
# Relevant code of `improvement-to-the-code` branch below [START]
print("End of program!")
# Relevant code of `improvement-to-the-code` branch above [END]
>>>>>>> improvement-to-the-code
要解决冲突,您可以在improvement-to-the-code
分支代码之后紧跟着写HEAD
分支代码:
def main():
print("Start of program>>>>>>>")
print("End of program!")
main()