did you use `git mv software/base/src/main/java/brooklyn/entity/basic/lifecycle/CommonCommands.java core/src/main/java/brooklyn/util/ssh/CommonCommands.java`? That (sometimes) preserves the history of the file, and makes the pull request diff show that only the changes rather than a delete + create.