Documentation
¶
Index ¶
Constants ¶
This section is empty.
Variables ¶
View Source
var FirstChangeFileContent = `
This
Is
The
First Change
File
`
View Source
var MergeConflictsSetup = func(shell *Shell) { shell. NewBranch("original-branch"). EmptyCommit("one"). EmptyCommit("two"). EmptyCommit("three"). CreateFileAndAdd("file", OriginalFileContent). Commit("original"). NewBranch("first-change-branch"). UpdateFileAndAdd("file", FirstChangeFileContent). Commit("first change"). Checkout("original-branch"). NewBranch("second-change-branch"). UpdateFileAndAdd("file", SecondChangeFileContent). Commit("second change"). EmptyCommit("second-change-branch unrelated change"). Checkout("first-change-branch") }
prepares us for a rebase/merge that has conflicts
View Source
var OriginalFileContent = `
This
Is
The
Original
File
`
View Source
var SecondChangeFileContent = `
This
Is
The
Second Change
File
`
Functions ¶
This section is empty.
Types ¶
This section is empty.
Click to show internal directories.
Click to hide internal directories.