I did the whole thing in VSCode version control. I have two branches, a main and b1 branch. b1 branch came from main branch. After doing some commits on b1, I merged it back into main, but main already got…
Until recently, in VSCode, handling merge conflicts was simple (to me, at least): Accept Current Change, Accept Incoming Change, Accept Both Changes, Compare Changes. It used to be something like this: source However, from v1.70 onwards, it's been updated. See…
I use VS CODE for version control (using git). Every time I had a conflict, VS CODE showed me with a layout where I could see all the changes in one window: However, with no advice, it change to a…