mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-21 04:25:53 +03:00
362678e2ef
When you are in the middle of a rebase, and you cherry-pick a commit which conflicts, it helps to be clear on whether you are prompted to continue the cherry-pick or the rebase.
34 lines
919 B
Go
34 lines
919 B
Go
package conflicts
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
|
|
)
|
|
|
|
var ResolveExternally = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Ensures that when merge conflicts are resolved outside of lazygit, lazygit prompts you to continue",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shared.CreateMergeConflictFile(shell)
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("UU file").IsSelected(),
|
|
).
|
|
Tap(func() {
|
|
t.Shell().UpdateFile("file", "resolved content")
|
|
}).
|
|
Press(keys.Universal.Refresh)
|
|
|
|
t.Common().ContinueOnConflictsResolved("merge")
|
|
|
|
t.Views().Files().
|
|
IsEmpty()
|
|
},
|
|
})
|