Can we see the relevant parts of
git log --graph --decorate --all --oneline? This will show your true history of master, BranchA, featureBranch. Please be sure to sanitize the commit logs so you're not posting private information.