No matches were found for subject:"more git weirdness \(git rebase, merge conflicts"