Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vagabond1-1983/JavaRock
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: sidaofeng/JavaRock
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 18 files changed
  • 2 contributors

Commits on Feb 5, 2020

  1. 调整了pom.xml，使得可以顺利部署

    wb-jcg519368
    wb-jcg519368 committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    331bb41 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2020

  1. 1、修改settings的JAVA_COMPILE 

    2、调整对应maven的settings文件和依赖库文件
    @sidaofeng
    sidaofeng committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    70b5152 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	.idea/.gitignore
#	.idea/compiler.xml
#	.idea/misc.xml
#	pom.xml
#	src/main/java/com/test/basic/practice/multiStatus/bone.java
    @sidaofeng
    sidaofeng committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    386a15a View commit details
    Browse the repository at this point in the history

  3. 1、修改settings的JAVA_COMPILE 

    2、调整对应maven的settings文件和依赖库文件
    @sidaofeng
    sidaofeng committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    9b19a9c View commit details
    Browse the repository at this point in the history
Loading