5,454 questions
Visual Studio 2022 errors opening a solution after a git rebase with conflicts
![](data:image/svg+xml, %3Csvg xmlns='http://www.w3.org/2000/svg' height='64' class='font-weight-bold' style='font: 600 30.11764705882353px "SegoeUI", Arial' width='64'%3E%3Ccircle fill='hsl(272, 54%, 36%)' cx='32' cy='32' r='32' /%3E%3Ctext x='50%25' y='55%25' dominant-baseline='middle' text-anchor='middle' fill='%23FFF' %3ERL%3C/text%3E%3C/svg%3E)
Ron L
0
Reputation points
When I have to rebase a solution in git, my normal practice is to close the solution in VS 2022, but keep VS open, then run the rebase from the command line and use VS to resolve rebase conflicts. I have found though that when I do have merge conflicts in the rebase operation, after the rebase is complete and pushed, when I reopen the solution in VS (File | Recent Projects and Solutions | my solution) I often get a dialog saying that VS cannot find the solution file and asking if I want to remove it from the recents list. Answering "yes" requires me to find the solution directory to reopen it, and I have found that the best approach is to close VS completely. However when I do that and then reopen VS and select my solution from the Recents list, the solution opens but none of my previously open files are reopened.
Does anyone have a solution for this problem? And is anyone else seeing a similar problem?
TIA
Developer technologies | Visual Studio | Other
{count} votes
-
![](data:image/svg+xml, %3Csvg xmlns='http://www.w3.org/2000/svg' height='64' class='font-weight-bold' style='font: 600 30.11764705882353px "SegoeUI", Arial' width='64'%3E%3Ccircle fill='hsl(140.8, 78%, 23%)' cx='32' cy='32' r='32' /%3E%3Ctext x='50%25' y='55%25' dominant-baseline='middle' text-anchor='middle' fill='%23FFF' %3ETS%3C/text%3E%3C/svg%3E)
Tianyu Sun-MSFT 34,441 Reputation points Microsoft External Staff2023-09-19T09:13:26.0033333+00:00 Hello @Ron L,
Welcome to Microsoft Q&A forum.
Is Tools > Options > Projects and Solutions > General > "Reopen documents on solution load" option selected on your side?
-
Ron L 0 Reputation points
2023-09-19T10:28:03.3566667+00:00 Hi Tianyu Sun,
Thank you for the reply. Yes, I do have that setting selected, and in normal circumstances the files reopen when I open the solution in VS. The non-opening files is one of two symptoms of the problem that occurs when I have rebased and resolved merge conflicts using VS as the merge editor.
-
Tianyu Sun-MSFT 34,441 Reputation points Microsoft External Staff
2023-09-22T06:24:38.67+00:00 Hi @Ron L,
The information about the needed to be auto opened files are stored in the hidden .vs folder. Can you confirm that after you ran the rebase, the .vs folder(in solution folder) and the solution file was/wasn’t modified/removed? And was their location(path) changed?
If the location is changed, then VS cannot detect the solution file correctly, and if the hidden .vs folder is removed or modified, then those opening files will not be opened again when you open the project the next time.
Sign in to comment
Sign in to answer