current position:Home>Bug - the idea of big data (a: local and git conflict)

Bug - the idea of big data (a: local and git conflict)

2022-08-06 20:02:38Uchiha cloud

I. Error: Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.

Two. Solutions

Step 1: Store our current code first.

insert image description here

The current code has been saved and displayed as the last code.

Step 2: Pull the latest code.

Step 3: Merge.

insert image description here

copyright notice
author[Uchiha cloud],Please bring the original link to reprint, thank you.
https://en.cdmana.com/2022/218/202208061955573535.html

Random recommended