error Your local changes to the following files would be overwritten by merge 02-DSDB02-笔记07_HTTP&Tomcatmd 02-DSDB02-笔记08_SQLmdPlease commit your changes or stash them before you mergeAb

The error message suggests that there are local changes in the files "07_HTTP&Tomcat.md" and "08_SQL.md" that will be overwritten if you proceed with the merge.

To resolve this issue, you have two options:

1. Commit your changes: If you want to keep the local changes you have made, you need to commit them before merging. Use the command git commit -m "Commit message" to commit your changes. After committing, you can try merging again.

2. Stash your changes: If you don't want to commit the changes yet, you can stash them temporarily. Use the command git stash to stash your changes. After stashing, you can try merging again. Once the merge is successful, you can apply the stash using git stash apply or git stash pop to retrieve your changes.

Make sure to choose the option that suits your requirements and then attempt the merge again