MCPcopy
hub / github.com/jesseduffield/lazygit / AcknowledgeConflicts

Method AcknowledgeConflicts

pkg/integration/components/common.go:41–46  ·  view source on GitHub ↗
()

Source from the content-addressed store, hash-verified

39}
40
41func (self *Common) AcknowledgeConflicts() {
42 self.t.ExpectPopup().Menu().
43 Title(Equals("Conflicts!")).
44 Select(Contains("View conflicts")).
45 Confirm()
46}
47
48func (self *Common) ContinueOnConflictsResolved(command string) {
49 self.t.ExpectPopup().Confirmation().

Callers 15

move_to_index_from_added_file_with_conflict.goFile · 0.80
move_to_index_with_conflict.goFile · 0.80
move_to_earlier_commit_from_added_file.goFile · 0.80
doTheRebaseForAmendTestsFunction · 0.80
cherry_pick_conflicts_empty_commit_after_resolving.goFile · 0.80
cherry_pick_conflicts.goFile · 0.80
edit_the_confl_commit.goFile · 0.80
amend_commit_with_conflict.goFile · 0.80
handleConflictsFromSwapFunction · 0.80
mode_specific_keybinding_suggestions.goFile · 0.80
pull_merge_conflict.goFile · 0.80
pull_rebase_interactive_conflict_drop.goFile · 0.80

Calls 7

EqualsFunction · 0.85
ContainsFunction · 0.85
SelectMethod · 0.80
ExpectPopupMethod · 0.80
ConfirmMethod · 0.65
TitleMethod · 0.65
MenuMethod · 0.65

Tested by

no test coverage detected