Practice: conflict

[yeonns]

Practice: conflict

1. Create feat/conflict branch at local and create conflict/Conflict.java file like below.

public class Conflict {

    public static Integer getLength(String str) {
        return str.length();
    }

    public static void main(String[] args) {
        String s1 = "hello";
        System.out.println("hello's length: " + getLength(s1));
    }
}

2. Commit and push to your forked repository

$ git add .
$ git commit -m "feat: conflict commit"
$ git push <YOUR_ID> feat/conflict

3. Make PR, then you can check conflict.
   feat/conflict_base ◀️ feat/conflict

4. Merge feat/conflict_base at local

$ git merge origin feat/conflict_base

5. Resolve conflict like below

package conflict;

public class Conflict {

    public static Integer getLength(String str) {
        return str.length();
    }

    public static void main(String[] args) {
        String s1 = "hello";
        String s2 = "world";
        System.out.println("hello world's length: " + getLength(s1));
    }
}

6. Push commit to feat/conflict

$ git add .
$ git commit -m "fix: resolve conflict"
$ git push <YOUR_ID> feat/conflict

7. Result should be like below!