Fix/resolve conflicts staging#2025

harshithad0703 merged 15 commits into

developmentcontentstack/cli:developmentfrom

fix/resolve-conflicts-stagingcontentstack/cli:fix/resolve-conflicts-stagingCopy head branch name to clipboard