go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-01 13:17:53 +02:00
Code Issues Releases Activity

allow editing or opening a file while resolving merge conflicts

Browse Source
This commit is contained in:
Jesse Duffield 2019-11-12 21:24:01 +11:00
parent 30aed94aa8
commit 7995d56a85
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/files_panel.go
View File

@ -66,6 +66,8 @@ func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View, alreadySelected bo
} }
if file.HasInlineMergeConflicts { if file.HasInlineMergeConflicts {
gui.getMainView().Title = gui.Tr.SLocalize("MergeConflictsTitle")
gui.State.SplitMainPanel = false
return gui.refreshMergePanel() return gui.refreshMergePanel()
} }

14
pkg/gui/keybindings.go
View File

@ -910,12 +910,10 @@ func (gui *Gui) GetContextMap() map[string][]*Binding {
Key: gocui.KeyArrowRight, Key: gocui.KeyArrowRight,
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleSelectNextConflict, Handler: gui.handleSelectNextConflict,
Description: gui.Tr.SLocalize("NextConflict"), Description: gui.Tr.SLocalize("NextConflict"),
}, { }, {
ViewName: "main", ViewName: "main",
Key: gocui.KeyArrowUp, Key: gocui.KeyArrowUp,
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleSelectTop, Handler: gui.handleSelectTop,
Description: gui.Tr.SLocalize("SelectTop"), Description: gui.Tr.SLocalize("SelectTop"),
@ -961,6 +959,18 @@ func (gui *Gui) GetContextMap() map[string][]*Binding {
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handlePopFileSnapshot, Handler: gui.handlePopFileSnapshot,
Description: gui.Tr.SLocalize("Undo"), Description: gui.Tr.SLocalize("Undo"),
}, {
ViewName: "main",
Key: 'e',
Modifier: gocui.ModNone,
Handler: gui.handleFileEdit,
Description: gui.Tr.SLocalize("editFile"),
}, {
ViewName: "main",
Key: 'o',
Modifier: gocui.ModNone,
Handler: gui.handleFileOpen,
Description: gui.Tr.SLocalize("openFile"),
}, },
}, },
} }

3
pkg/i18n/english.go
View File

@ -147,6 +147,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
}, &i18n.Message{ }, &i18n.Message{
ID: "resolveMergeConflicts", ID: "resolveMergeConflicts",
Other: "resolve merge conflicts", Other: "resolve merge conflicts",
}, &i18n.Message{
ID: "MergeConflictsTitle",
Other: "Merge Conflicts",
}, &i18n.Message{ }, &i18n.Message{
ID: "checkout", ID: "checkout",
Other: "checkout", Other: "checkout",