https://forge.codesys.com/forge/talk/Engineering/thread/19a71b0420/2023-03-22T13:00:15.886000ZRecent posts to Codesys V3.5 SP17 Patch 3 (64-Bit) + Git Integration - Status and Changes Window2023-03-22T13:00:15.886000Z2023-03-22T13:00:15.886000Zhappychappyhttps://forge.codesys.com/u/happychappy/https://forge.codesys.comfff6067d32d5123be32e4add5ab2db21d3e9ff9b

<div class="markdown_content"><p>+</p></div>

2023-03-06T13:34:56.379000Z2023-03-06T13:34:56.379000Zhappychappyhttps://forge.codesys.com/u/happychappy/https://forge.codesys.comef722d776d3a4fe0b44a7df4de2825a10b5d23e5

<div class="markdown_content"><p>+</p></div>

2023-02-20T12:14:51.257000Z2023-02-20T12:14:51.257000Zhappychappyhttps://forge.codesys.com/u/happychappy/https://forge.codesys.com6cf59ee185126a5bc9c833112186105ec10a540f

<div class="markdown_content"><p>+</p></div>

2023-02-10T06:48:45.097000Z2023-02-10T06:48:45.097000Zhappychappyhttps://forge.codesys.com/u/happychappy/https://forge.codesys.com42014e83ae44722041ad8b450625ef57ea2b477b

<div class="markdown_content"><p>+</p></div>

2023-02-06T14:53:36.210000Z2023-02-06T14:53:36.210000Zhappychappyhttps://forge.codesys.com/u/happychappy/https://forge.codesys.com59efbf210e58d38f4d977f88ea342a40a2c0cae6

<div class="markdown_content"><p>Hi</p> <p>I found a new feature in codesys where after I attempted a merge between a remote branch and my current local branch, codesys gave me a dialog(Codesys - Error.jpg). Since continue did not solve issues, I had to quit the application. Once I restarted codesy, I can see at the bottom right, that codesys is still in progress with the merge request, HOWEVER I can not open the Status and Changes window, I click on it but it never opens. I can not roll back or do anything, since codesys wants me to complete the merge request. How am I suppose to get around this.</p> <p>So what is my next step, since I do not have a remote backup of my local branch I was working in.</p> <p>Regards</p></div>