other commit
change2
change3
develop updated
Merge branch 'develop' of https://github.com/merphonos/study into develop

Conflicts:
	HelloGit/src/main/java/Hello/HelloGit/App.java
Update App.java
feature test
Update App.java
Merge branch 'develop' of https://github.com/merphonos/study into feature/new_feature

Conflicts:
	HelloGit/src/main/java/Hello/HelloGit/App.java
after pull
Merge branch 'feature/new_feature' into develop
new feature 2
remote modify
Merge branch 'develop' of https://github.com/merphonos/study into develop

Conflicts:
	HelloGit/src/main/java/Hello/HelloGit/App.java
delete feature start
Revert "delete feature start"

This reverts commit fef02c5a1c859938640974af6685a686bd7778f3.
Merge branch 'feature/delete_feature' into develop
Update App.java
modify for feature test
Merge branch 'release/release_test'

Conflicts:
	HelloGit/src/main/java/Hello/HelloGit/App.java