Messed up while trying to commit/merge
Which part is the new part and what is the old, or is there anyway to just remove the changes that were made. cant run the program anymore since the csproj files are broken
12 Replies
Since I was writing the project on 2 computers I thought merging would be smart, obviously that was not the case and I shouldve somehow just overwritten everything but now I'm stuck with this. What do I remove or how do I "unmerge" everything?
this is a merge conflict, basically git doesn't know how to merge and is asking you do choose which changes you want to keep manually
yh I've understood that much rn
so choose the section that you want to keep, and delete the rest
im in the merge editor but only want everything from the right side and even when I click accept all changes from right and "complete merge" nothing seems to happen
do I just delete the left side?
there is no left/right side in the screenshot, there's HEAD and your branch
cause its my old file from my other computer that is long outdated, so all I really want is one side
so just edit the file to only have what you want to keep
sorry but its looking like this rn
the program.cs file got messed up too apparently
though it didnt look wrong at first
idk about VSC's built in conflict resolution
you can still abort the merge if you are in troubles