Then you choose the file! The file need to be within the project directory.Īnd then you choose a file and the compare editor will open You can see the different possible ways! For a file we can choose compare active file with. (May require the newer version of vscode)

Native way (direct open of the compare editor) Otherwise it can be ok with atomic commit and merge mention!Īlso if what you need is to be able to keep a lot from the current file! You can copy the current elsewhere! past the other file to compare! commit ! and then past again the old one! You'll have the old in the right and as current (Not as described on the above) In such a scenario this work well! (Hacky a bit but you may need it).

Here some tips! If you want to have the commit history cleaner! Or not have a merge separate! You can remove the last commits from history as much as you need: Without hard reset and commit again a cleaner one! git reset -soft HEAD~1 Well to sum up! Git tool and diffing in vscode is so powerful! And all that one need! The only problem is the extra step of committing and cleaning after if desired! Here an illustration of direct modification for instance the part in the left is missing from the current fileĪnd here another illustration (current have in plus) And save.Ĭool now in the git pallet you can see the file in changes list! Click on it and the diffing editor will show!īingo this is it! You can compare and make direct changment! The diffing will keep happening in real time. Once done: copy past the other file to diff on the place of the current one. This way may be available on older version of vscode too! Still a good thing to know! (even we should always run on the latest version! And vscode is always keeping getting better and better).Ī native powerful and cool way is to use the git toolset within vscode! It still not the most fluid way! But if you are in a setup where you don't have anything else or time or resources to use anything else! Also as a requirement you need to have a git repo initiated! Here we go:įirst we will use the change and diffing capability of the git tool set. (Make sure to look on the second title as it's a better native way!) First using vscode natively with the git toolset

Win merge for mac