@if(hasConflict){
We can’t automatically merge this pull request.
} else {
This pull request can be automatically merged.
}
@if(hasConflict){
Use the command line to resolve conflicts before continuing.
} else {
You can also merge branches on the command line.
}
@if(hasConflict){
Checkout via command line
If you cannot merge a pull request automatically here, you have the option of checking
it out via command line to resolve conflicts and perform a manual merge.
} else {
Merging via command line
If you do not want to use the merge button or an automatic merge cannot be performed,
you can perform a manual merge on the command line.