starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-02-04 21:25:09 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

Merge conflict tag detected in ElectronNET.API\BridgeConnector.cs #789

New Issue
Closed
opened 2026-01-29 16:48:38 +00:00 by claunia · 2 comments
claunia commented 2026-01-29 16:48:38 +00:00
Owner
Copy Link

Originally created by @minyuanchen on GitHub (May 11, 2022).

Originally assigned to: @GregorBiswanger on GitHub.

  • Version:
  • Target: Windows

Steps to Reproduce:

  1. Get the latest code
  2. Run "electronize start"
    螢幕截圖 2022-05-11 11 59 47
Originally created by @minyuanchen on GitHub (May 11, 2022). Originally assigned to: @GregorBiswanger on GitHub. <!-- Please search existing issues to avoid creating duplicates. --> <!-- Which version of Electron.NET CLI and API are you using? --> <!-- Please always try to use latest version before report. --> * **Version**: <!-- Which version of .NET Core and Node.js are you using (if applicable)? --> <!-- What target are you building for? --> * **Target**: Windows <!-- Enter your issue details below this comment. --> <!-- If you want, you can donate to increase issue priority (https://donorbox.org/electron-net) --> Steps to Reproduce: 1. Get the latest code 2. Run "electronize start" ![螢幕截圖 2022-05-11 11 59 47](https://user-images.githubusercontent.com/23494376/167766964-e06571dd-12e0-4803-8598-e6a650d300bf.png)
claunia added the bug label 2026-01-29 16:48:38 +00:00
claunia commented 2026-01-29 16:48:39 +00:00
Author
Owner
Copy Link

@mz-celldom commented on GitHub (May 27, 2022):

Also in StartElectronCommand.cs and in BuildCommand.cs

grep '>>>>>' -rn --include *.cs
ElectronNET.API/BridgeConnector.cs:423:>>>>>>> 64e058b0b59a4fbbd6c0ec9de2ee1850a66684c4
ElectronNET.CLI/Commands/StartElectronCommand.cs:125:>>>>>>> 2331ef43b4c2028c57564f3a8c885555c81661d4
ElectronNET.CLI/Commands/BuildCommand.cs:127:>>>>>>> 5338749e4d2b0fcd9c46bad1a61e5c7d7d0f18cc
ElectronNET.CLI/Commands/BuildCommand.cs:285:>>>>>>> 5338749e4d2b0fcd9c46bad1a61e5c7d7d0f18cc
@mz-celldom commented on GitHub (May 27, 2022): Also in StartElectronCommand.cs and in BuildCommand.cs ``` grep '>>>>>' -rn --include *.cs ElectronNET.API/BridgeConnector.cs:423:>>>>>>> 64e058b0b59a4fbbd6c0ec9de2ee1850a66684c4 ElectronNET.CLI/Commands/StartElectronCommand.cs:125:>>>>>>> 2331ef43b4c2028c57564f3a8c885555c81661d4 ElectronNET.CLI/Commands/BuildCommand.cs:127:>>>>>>> 5338749e4d2b0fcd9c46bad1a61e5c7d7d0f18cc ElectronNET.CLI/Commands/BuildCommand.cs:285:>>>>>>> 5338749e4d2b0fcd9c46bad1a61e5c7d7d0f18cc ```
claunia commented 2026-01-29 16:48:39 +00:00
Author
Owner
Copy Link

@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.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
api
api
applications
bug
bug
dev-experience
discussion
documentation
duplicate
enhancement
examples
Feature
Feature
good first issue
help wanted
In progress
information
infrastructure
invalid
javascript
macos
more-information-needed
pull-request
Mirrored from GitHub Pull Request
 question
No Label bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
claunia
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/Electron.NET#789
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?