How to solve these conflicts
Answered
Anay-208 | Ping in replies posted this in #help-forum
So I got these conflicts, how do I solve them?
I got this just after moving a folder around.
if I try in editor, some files get deleted, which idk how to restore
I got this just after moving a folder around.
if I try in editor, some files get deleted, which idk how to restore
Answered by Roseate Spoonbill
During rebase, conflicts are resolved commit by commit, which may explain why some files are deleted - only after resolving all conflicts, you'll see final directory tree with all files.
7 Replies
Asian black bear
You'll probably have to rebase.
I've tried to
git pull origin main --rebase, but it deletes some filesjust fix the merge conflicts? you should know how to fix the conflicts
merge conflicts are not that scary
Roseate Spoonbill
During rebase, conflicts are resolved commit by commit, which may explain why some files are deleted - only after resolving all conflicts, you'll see final directory tree with all files.
Answer
My bad wrong one
Thanks