title: Staged changes visual studio code
body: <p>I did a merge between two branches, it generates some conflicts, no problem, but it generates in my visual studio a tab called &quot;changes by stages&quot; 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?</p>
  <p>I have tried doing git add. but add part of the codes that I don't want in my branch</p>