Current master has unresolved merge conflicts. #799

New Issue

claunia · 2026-01-29T16:48:57Z

claunia commented

2026-01-29 16:48:57 +00:00

Originally created by @danatcofo on GitHub (May 31, 2022).

Originally assigned to: @GregorBiswanger on GitHub.

There wasn't due diligence in reviewing some changes or testing the code. These 3 areas have unresolved conflicts baked into the files. This also indicates that there might be some other logic conflicts as well baked into the files given that BridgeConnector is used heavily in many areas.

Originally created by @danatcofo on GitHub (May 31, 2022). Originally assigned to: @GregorBiswanger on GitHub. There wasn't due diligence in reviewing some changes or testing the code. These 3 areas have unresolved conflicts baked into the files. This also indicates that there might be some other logic conflicts as well baked into the files given that BridgeConnector is used heavily in many areas. * [ElectronNet.API/BridgeConnector.cs](https://github.com/ElectronNET/Electron.NET/blob/master/ElectronNET.API/BridgeConnector.cs#L301) * [ElectronNet.CLI/Commands/BuildCommand.cs](https://github.com/ElectronNET/Electron.NET/blob/master/ElectronNET.CLI/Commands/BuildCommand.cs#L123) * [ElectronNet.CLI/Commands/StartElectronCommand.cs](https://github.com/ElectronNET/Electron.NET/blob/master/ElectronNET.CLI/Commands/StartElectronCommand.cs#L101)

claunia added the bug label 2026-01-29 16:48:57 +00:00

claunia closed this issue

2026-01-29 16:48:57 +00:00

claunia commented

2026-01-29 16:48:58 +00:00

@danatcofo commented on GitHub (May 31, 2022):

inside BuildCommand.cs we have these lines where defaultReadyToRun & defaultSingleFile are undefined. They appear to be expected inside the GetDotNetPublishFlags argument list. Also, elsewhere it is expected that this method is internal or public rather than private

        private Dictionary<string, string> GetDotNetPublishFlags(SimpleCommandLineParser parser)
        {
            var dotNetPublishFlags = new Dictionary<string, string>
            {
                {"/p:PublishReadyToRun", parser.TryGet(_paramPublishReadyToRun, out var rtr) ? rtr[0] : defaultReadyToRun},
                {"/p:PublishSingleFile", parser.TryGet(_paramPublishSingleFile, out var psf) ? psf[0] : defaultSingleFile},
            };

@danatcofo commented on GitHub (May 31, 2022): inside BuildCommand.cs we have these lines where `defaultReadyToRun` & `defaultSingleFile` are undefined. They appear to be expected inside the GetDotNetPublishFlags argument list. Also, elsewhere it is expected that this method is internal or public rather than private ```csharp private Dictionary<string, string> GetDotNetPublishFlags(SimpleCommandLineParser parser) { var dotNetPublishFlags = new Dictionary<string, string> { {"/p:PublishReadyToRun", parser.TryGet(_paramPublishReadyToRun, out var rtr) ? rtr[0] : defaultReadyToRun}, {"/p:PublishSingleFile", parser.TryGet(_paramPublishSingleFile, out var psf) ? psf[0] : defaultSingleFile}, }; ```

claunia commented

2026-01-29 16:48:58 +00:00

@danatcofo commented on GitHub (May 31, 2022):

Looking at the changes... seems like the build/start command updates were both my commits, however looks like they conflicted and were not resolved as part of a merge by Gregor... I'm working on a fix, just documenting the issue here right now.

@danatcofo commented on GitHub (May 31, 2022): Looking at the changes... seems like the build/start command updates were both my commits, however looks like they conflicted and were not resolved as part of a merge by Gregor... I'm working on a fix, just documenting the issue here right now.

claunia commented

2026-01-29 16:48:59 +00:00

@danatcofo commented on GitHub (May 31, 2022):

@theolivenbaum I've fixed the conflicts that come from merge issues from my 2 PR's. However there is still conflicts both structure and logical inside ElectronNET.API. Could you take a look at them and submit a PR fixing those conflicts?

@danatcofo commented on GitHub (May 31, 2022): @theolivenbaum I've fixed the conflicts that come from merge issues from my 2 PR's. However there is still conflicts both structure and logical inside ElectronNET.API. Could you take a look at them and submit a PR fixing those conflicts?

claunia commented

2026-01-29 16:48:59 +00:00

@theolivenbaum commented on GitHub (May 31, 2022):

@danatcofo did you check against the PR or my fork? Just because there's plenty that has happened there after the original PR

@theolivenbaum commented on GitHub (May 31, 2022): @danatcofo did you check against the PR or my fork? Just because there's plenty that has happened there after the original PR

claunia commented

2026-01-29 16:48:59 +00:00

@danatcofo commented on GitHub (May 31, 2022):

@theolivenbaum I did a blame on the BridgeConnector inside master branch. The changes appear to be from a merge of one of your other pr's that wasn't properly tested prior to commit of the merge. This is leaving master branch in a non-working state. This is totally not your doing as there was a slew of merges at that time and you were not the only one's who got sideswiped here. However there is enough going on with your changes that I don't feel comfortable fixing it without messing something up. Its a fairly broad scope of changes to ensure works correctly.

Yes you have another PR open now of ongoing changes but that doesn't resolve whats going on with current master.

@danatcofo commented on GitHub (May 31, 2022): @theolivenbaum I did a blame on the BridgeConnector inside master branch. The changes appear to be from a merge of one of your other pr's that wasn't properly tested prior to commit of the merge. This is leaving master branch in a non-working state. This is totally not your doing as there was a slew of merges at that time and you were not the only one's who got sideswiped here. However there is enough going on with your changes that I don't feel comfortable fixing it without messing something up. Its a fairly broad scope of changes to ensure works correctly. Yes you have another PR open now of ongoing changes but that doesn't resolve whats going on with current master.

claunia commented

2026-01-29 16:49:00 +00:00

@bigredhdl commented on GitHub (Sep 19, 2022):

@danatcofo , @GregorBiswanger or @theolivenbaum Can any of you recommend a way forward on this?

@bigredhdl commented on GitHub (Sep 19, 2022): @danatcofo , @GregorBiswanger or @theolivenbaum Can any of you recommend a way forward on this?

claunia commented

2026-01-29 16:49:00 +00:00

@GregorBiswanger commented on GitHub (Sep 21, 2022):

@bigredhdl I'm currently waiting for @theolivenbaum to check the current branch again. Code is otherwise compatible. only an error message comes up during the build. If the error is fixed, we can publish a new release as soon as possible.

@GregorBiswanger commented on GitHub (Sep 21, 2022): @bigredhdl I'm currently waiting for @theolivenbaum to check the current branch again. Code is otherwise compatible. only an error message comes up during the build. If the error is fixed, we can publish a new release as soon as possible.

claunia commented

2026-01-29 16:49:01 +00:00

@GregorBiswanger commented on GitHub (Mar 28, 2023):

🎉🚀 New Electron.NET version 23.6.1 released 🚀🎉

With native Electron 23 and .NET 6 support. Your problem should be fixed here. If you continue to have the problem, please let us know. Please note the correct updating of your API & CLI. Info in the README. Have fun!

@GregorBiswanger commented on GitHub (Mar 28, 2023): 🎉🚀 New Electron.NET version 23.6.1 released 🚀🎉 With native Electron 23 and .NET 6 support. Your problem should be fixed here. If you continue to have the problem, please let us know. Please note the correct updating of your API & CLI. Info in the README. Have fun!

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/Electron.NET#799