[#6821] Remove old last_commit_ids method and fix handling of merge commits in git

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>