Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-02 11:10:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict discard and merge view copy commands

Browse Source 
- add Discard actions for conflicted files and conflict groups
  - restore discarded conflicts from HEAD in both index and working tree
  - restrict regular discard actions to changed tracked files
  - preserve default editor commands when replacing an editor document
  - enable copying from the read-only merge-view side panels
  - cover conflict restoration and merge-side copying
  - document build parallelism and function-spacing conventions
This commit is contained in:
Martín Lucas Golini
2026-08-31 11:03:19 -03:00
parent 7c92b59e00
commit 36200430aa
10 changed files with 104 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.agent/rules/project-introduction.md
+6
View File
@@ -43,6 +43,12 @@ declarations and unqualified eepp type names, such as `UISplitter`, over repeate
qualified names such as `EE::UI::UISplitter`. Keep explicit qualification only where it is required
to resolve ambiguity or avoid importing an unusually broad namespace into an unsuitable scope.
## Function Spacing
Always leave one blank line between consecutive function declarations in headers and between
consecutive function definitions in implementation files. This is a project-wide stylistic
constraint, including short inline functions.
## Control-Statement Braces
Use braces around the body of an `if`, `else`, `for`, `while`, or similar control statement whenever