You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
If a sub conflict region is empty (see example below), MergeConflictService will try to read commit logs even though none exist since no changes were made in this region. Update the implementation to fix this.
Example:
public class Test {
private String testAttribute1;
public void sayHelloThere() {
<<<<<<< HEAD
=======
causeMethodoExtraction();
}
public void causeMethodoExtraction() {
>>>>>>> testBranch1
System.out.println("Hello there!");
}
}
The text was updated successfully, but these errors were encountered:
If a sub conflict region is empty (see example below),
MergeConflictService
will try to read commit logs even though none exist since no changes were made in this region. Update the implementation to fix this.Example:
The text was updated successfully, but these errors were encountered: