Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-18 11:33:23 +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
src/tools/ecode/plugins/git/gitplugin.hpp
+2 -1
View File
@@ -323,11 +323,12 @@ class GitPlugin : public PluginBase {
void unstage( const std::vector<std::string>& files );
enum class FileOperation { Stage, Unstage, Discard };
enum class FileOperation { Stage, Unstage, Discard, RestoreHead };
void runFileOperation( std::vector<std::string> files, FileOperation operation );
void discard( const std::vector<std::string>& files );
void discardConflicts( const std::vector<std::string>& files );
void discard( const std::string& file );