[PR #698] [MERGED] #697 fixing conflicts in ElectronNET.CLI commands #1259

New Issue

claunia · 2026-01-29T16:59:02Z

claunia commented

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

📋 Pull Request Information

Original PR: https://github.com/ElectronNET/Electron.NET/pull/698
Author: @danatcofo
Created: 5/31/2022
Status: ✅ Merged
Merged: 6/7/2022
Merged by: @GregorBiswanger

Base: master ← Head: bad-master

📝 Commits (1)

2ff29e5 #697 fixing conflicts in ElectronNET.CLI commands

📊 Changes

2 files changed (+6 additions, -40 deletions)

View changed files

📝 ElectronNET.CLI/Commands/BuildCommand.cs (+4 -12)
📝 ElectronNET.CLI/Commands/StartElectronCommand.cs (+2 -28)

📄 Description

also #693

this only fixes the conflicts that are in ElectronNET.CLI project. The ones in ElectronNET.API still remain.

@GregorBiswanger FYI

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/ElectronNET/Electron.NET/pull/698 **Author:** [@danatcofo](https://github.com/danatcofo) **Created:** 5/31/2022 **Status:** ✅ Merged **Merged:** 6/7/2022 **Merged by:** [@GregorBiswanger](https://github.com/GregorBiswanger) **Base:** `master` ← **Head:** `bad-master` --- ### 📝 Commits (1) - [`2ff29e5`](https://github.com/ElectronNET/Electron.NET/commit/2ff29e553d08132ce156889cf9f7e26d99ad8a46) #697 fixing conflicts in ElectronNET.CLI commands ### 📊 Changes **2 files changed** (+6 additions, -40 deletions) <details> <summary>View changed files</summary> 📝 `ElectronNET.CLI/Commands/BuildCommand.cs` (+4 -12) 📝 `ElectronNET.CLI/Commands/StartElectronCommand.cs` (+2 -28) </details> ### 📄 Description also #693 this only fixes the conflicts that are in ElectronNET.CLI project. The ones in ElectronNET.API still remain. @GregorBiswanger FYI --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

claunia added the pull-request label 2026-01-29 16:59:02 +00:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/Electron.NET#1259