git 冲突如何解决

merge两个branch的时候出现下面的冲突如何解决

CONFLICT (add/add)

举例
<<<表示当前的提交， ====表示当前提交分隔符 ，>>>表示另外一个提交

解决冲突方式，去掉一个commit，保留一个

CONFLICT (content):

解决冲突方式，删除掉一个commit，保留一个commit
<<<表示当前的提交， ====表示当前提交分隔符 ，>>>表示另外一个提交

CONFLICT (rename/rename)

举例如下：
CONFLICT (rename/rename): Rename “python/iceberg/init.py”->“python/src/iceberg/init.py” in branch “HEAD” rename “python/iceberg/init.py”->“python/pyiceberg/init.py” in “apache-iceberg-0.14.0”
为了解决冲突
git add python/src/iceberg/init.py
git add python/pyiceberg/init.py

CONFLICT (modify/delete)

python/setup.py deleted in apache-iceberg-0.14.0 and modified in HEAD. Version HEAD of python/setup.py left in tree.
解决冲突
git rm python/setup.py

CONFLICT (rename/delete)

CONFLICT (rename/delete): python/iceberg/api/types/type.py deleted in apache-iceberg-0.14.0 and renamed to python_legacy/iceberg/api/types/type.py in HEAD. Version HEAD of python_legacy/iceberg/api/types/type.py left in tree.
解决冲突
git add python_legacy/iceberg/api/types/type.py