博文

目前显示的是标签为“debug”的博文

Config remote debug for tomcat hosted web application

Modify your tomcat startup script (startup.bat): Add this at the beginnng of startup.bat script set JPDA_ADDRESS=8000 set JPDA_TRANSPORT=dt_socket Replace  "call %EXECUTABLE%" start %CMD_LINE_ARGS%" to "call "%EXECUTABLE%" jpda start %CMD_LINE_ARGS%" Now tomcat start with opening port 8000 for debugging. Configure eclipse debug: In Run > Debug Configurations add a new debug configuration by selecting 'Remote Java Application' Use port 8000 and select the correct project to debug

What I did to reproduce the consequence of misuse of git merge commit

图片
Git is a powerful tool. More power means more responsibility.  We use git in our project. There are several developers so the commits are quite frequent.  Symptom:  Sometimes we see our changes and corresponding commits disappears after some developer do their merge commit. Their merge commit seems to have reverted away commits which has been done earlier by others.  In the commit log we see the guilty merge commit behavior very strange: It has two parent A and B. A is the guilty developer's local commit branch, and B is the other developer's commits branch. Strangely the merged commit would choose the status of A instead B in the merged results for files that has been changed and committed in commit branch B(which is other developers' commit). So the consequence is that after the merge commit, the changes has been committed and pushed by other developer will "gone"! The status of the   files from other developers' commit are "...