Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reading commit history for empty sub conflict regions will throw errors #5

Open
kpatenio opened this issue Aug 22, 2020 · 0 comments
Open
Assignees

Comments

@kpatenio
Copy link
Collaborator

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!");
    }
}
@kpatenio kpatenio added the bug Something isn't working label Aug 22, 2020
@kpatenio kpatenio self-assigned this Aug 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant