Git accept all incoming changes vscode8/14/2023 ![]() ![]() I can't post that here, but can use it to provide any details you might need and may be able to send it to you privately if that's helpful. This is so subtle and so weird to debug that I actually recorded a screen capture to figure out what was happening. I'll mention that I am using Remote-SSH for development. If you click "Accept Current Changes" on the 5th conflict again, it will properly handle the merge conflict, but now you're missing 2 random lines elsewhere. This is subtle because you can't really tell what was deleted and the Merge Conflict text does not go away with the first click. My theory is that those 2 lines further down were based on the line numbers prior to an autosave that occurred after I accepted the previous 4 changes so now the line numbers are incorrect. Its very easy just go to vs code and press Ctrl + shift + p (command palette) or go to view and open command palette manually and type 'merge' in your command palette, now you can see the Accept all current changes. On the 5th attempt I will click "Accept Current Changes" and 2 lines will be deleted, but they are lines further down into the file (unrelated to the conflict as ppazos indicates). The first 4 Merge conflict lines will be properly deleted. For all other files there doesnt seem to be any way to accept / reject changes even at the file level (i.e. I will be going through the file accepting changes. For files with conflicts which vscode recognises (i.e.py files) when I open the conflicted file it displays a bar at the top allow me to select the incoming changes or local changes. The scenario is as follows: a file will have 10 merge conflicts. I also intermittently have this problem (it does not seem related to the text of the merge conflict itself) and seems likely to be related to autosave and shifting line numbers. ![]()
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |