edit a.java
edit the same file
git work out the same file
merge branch that has the same change in file