gistfile1.txt

bro@bro-laptop:~/devilry/devilry/source$ git push
To [email protected]:espenak/devilry.git
 ! [rejected]        master -> master (non-fast forward)
error: failed to push some refs to '[email protected]:espenak/devilry.git'
bro@bro-laptop:~/devilry/devilry/source$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 4 and 5 different commit(s) each, respectively.
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   common/pom.xml
#	renamed:    core/src/main/java/org/devilry/core/session/dao/AssignmentNodeLocal.java -> common/src/main/java/org/devilry/core/daointerfaces/AssignmentNodeLocal.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/AssignmentNodeRemote.java -> common/src/main/java/org/devilry/core/daointerfaces/AssignmentNodeRemote.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/BaseNodeInterface.java -> common/src/main/java/org/devilry/core/daointerfaces/BaseNodeInterface.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/CourseNodeLocal.java -> common/src/main/java/org/devilry/core/daointerfaces/CourseNodeLocal.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/CourseNodeRemote.java -> common/src/main/java/org/devilry/core/daointerfaces/CourseNodeRemote.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/DeliveryCandidateLocal.java -> common/src/main/java/org/devilry/core/daointerfaces/DeliveryCandidateLocal.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/DeliveryCandidateRemote.java -> common/src/main/java/org/devilry/core/daointerfaces/DeliveryCandidateRemote.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/DeliveryLocal.java -> common/src/main/java/org/devilry/core/daointerfaces/DeliveryLocal.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/DeliveryRemote.java -> common/src/main/java/org/devilry/core/daointerfaces/DeliveryRemote.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/FileDataBlockRemote.java -> common/src/main/java/org/devilry/core/daointerfaces/FileDataBlockRemote.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/FileMetaRemote.java -> common/src/main/java/org/devilry/core/daointerfaces/FileMetaRemote.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/NodeLocal.java -> common/src/main/java/org/devilry/core/daointerfaces/NodeLocal.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/NodeRemote.java -> common/src/main/java/org/devilry/core/daointerfaces/NodeRemote.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/PeriodNodeLocal.java -> common/src/main/java/org/devilry/core/daointerfaces/PeriodNodeLocal.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/PeriodNodeRemote.java -> common/src/main/java/org/devilry/core/daointerfaces/PeriodNodeRemote.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/UserRemote.java -> common/src/main/java/org/devilry/core/daointerfaces/UserRemote.java
#	new file:   common/src/main/resources/META-INF/ejb-jar.xml
#	modified:   core/pom.xml
#	renamed:    core/src/main/java/org/devilry/core/session/dao/AssignmentNodeImpl.java -> core/src/main/java/org/devilry/core/dao/AssignmentNodeImpl.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/BaseNodeImpl.java -> core/src/main/java/org/devilry/core/dao/BaseNodeImpl.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/CourseNodeImpl.java -> core/src/main/java/org/devilry/core/dao/CourseNodeImpl.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/DeliveryCandidateImpl.java -> core/src/main/java/org/devilry/core/dao/DeliveryCandidateImpl.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/DeliveryImpl.java -> core/src/main/java/org/devilry/core/dao/DeliveryImpl.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/FileDataBlockImpl.java -> core/src/main/java/org/devilry/core/dao/FileDataBlockImpl.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/FileMetaImpl.java -> core/src/main/java/org/devilry/core/dao/FileMetaImpl.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/NodeImpl.java -> core/src/main/java/org/devilry/core/dao/NodeImpl.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/PeriodNodeImpl.java -> core/src/main/java/org/devilry/core/dao/PeriodNodeImpl.java
#	renamed:    core/src/main/java/org/devilry/core/session/dao/UserImpl.java -> core/src/main/java/org/devilry/core/dao/UserImpl.java
#	deleted:    core/src/main/java/org/devilry/core/session/TreeManagerImpl.java
#	deleted:    core/src/main/java/org/devilry/core/session/TreeManagerRemote.java
#	modified:   core/src/test/java/org/devilry/core/session/dao/AbstractDeliveryDaoTst.java
#	modified:   core/src/test/java/org/devilry/core/session/dao/AssignmentNodeImplTest.java
#	modified:   core/src/test/java/org/devilry/core/session/dao/CourseNodeImplTest.java
#	modified:   core/src/test/java/org/devilry/core/session/dao/DeliveryCandidateImplTest.java
#	modified:   core/src/test/java/org/devilry/core/session/dao/DeliveryImplTest.java
#	modified:   core/src/test/java/org/devilry/core/session/dao/FileDataBlockImplTest.java
#	modified:   core/src/test/java/org/devilry/core/session/dao/FileMetaImplTest.java
#	modified:   core/src/test/java/org/devilry/core/session/dao/NodeImplTest.java
#	modified:   core/src/test/java/org/devilry/core/session/dao/PeriodNodeImplTest.java
#	modified:   core/src/test/java/org/devilry/core/session/dao/UserImplTest.java
#	modified:   pom.xml
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	../.project
#	../bin/
bro@bro-laptop:~/devilry/devilry/source$