When a merge does not work automatically, git prevents
commit from running until a change has been made in the destination. In this instance the desired result was to choose the destination version of the file and ignore the source version, but git would not allow that. Here I added a blank line to let git commit think I resolved a merge conflict.
This commit is contained in:
commit
bd6dbdf3c7
|
@ -983,6 +983,7 @@ acpi_ds_load2_end_op (
|
|||
ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
|
||||
walk_state, &(new_node));
|
||||
if (ACPI_SUCCESS (status)) {
|
||||
|
||||
/*
|
||||
* Make sure that what we found is indeed a method
|
||||
* We didn't search for a method on purpose, to see if the name
|
||||
|
|
Loading…
Reference in a new issue