diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2018-06-10 11:37:10 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-06-10 11:37:10 +1000 |
commit | 691972b544a92bfba7ee2ce06c77963bbe40bcbe (patch) | |
tree | 3c724d6411e4bc8c910db0d59f2b204b64c5afb3 /merge_panel.go | |
parent | 21dd06989d5d56b09aef17ee0eb2176ed0c64ec5 (diff) |
scroll to merge conflict
Diffstat (limited to 'merge_panel.go')
-rw-r--r-- | merge_panel.go | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/merge_panel.go b/merge_panel.go index 6cf516a04..24fd1f6ef 100644 --- a/merge_panel.go +++ b/merge_panel.go @@ -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 |