I did a merge between two branches, it generates some conflicts, no problem, but it generates in my visual studio a tab called "changes by stages" with a list of files, I see in some files differences between them but I cannot accept or reject the changes What does staged changes mean, why did this happen, how can I fix it?
I have tried doing git add. but add part of the codes that I don't want in my branch
Switch back to command-line first and check the output of a git status: you should see the list of files with conflicts.
You can also see those in VSCode (they are in red with a trailing (!) to their name)
Only those files should have a way to accept "Current changes" or "Incoming changes" in VSCode editor.
Others should be staged, pending the resolution of the files with merge conflicts.
Once everything is added, the rebase can continue (git rebase --continue).
