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

scroll to merge conflict

Browse Source
This commit is contained in:
Jesse Duffield 2018-06-10 11:37:10 +10:00
parent 21dd06989d
commit 691972b544
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
merge_panel.go
View File

@ -181,9 +181,26 @@ func refreshMergePanel(g *gocui.Gui) error {
if err != nil {
return err
}
if err := scrollToConflict(g); err != nil {
return err
}
return renderString(g, "main", content)
}
func scrollToConflict(g *gocui.Gui) error {
mainView, err := g.View("main")
if err != nil {
return err
}
if len(state.Conflicts) == 0 {
return nil
}
conflict := state.Conflicts[state.ConflictIndex]
ox, oy := mainView.Origin()
devLog(oy, conflict.start)
return mainView.SetOrigin(ox, conflict.start)
}
func switchToMerging(g *gocui.Gui) error {
state.ConflictIndex = 0
state.ConflictTop = true