Sometimes local gets out of sync (showing it’s ahead of origin/c4) if I’m on c4 for example and trying to run c4pr.sh on a branch which is on upstream and has conflicts.
Fix that shouldn't be necessary:
git fetch origin
git reset --hard origin/c4
May be related to running c4pr.sh when on c4. Running from a feature branch seems to work fine.
Sometimes local gets out of sync (showing it’s ahead of origin/c4) if I’m on c4 for example and trying to run c4pr.sh on a branch which is on upstream and has conflicts.
Fix that shouldn't be necessary:
May be related to running c4pr.sh when on c4. Running from a feature branch seems to work fine.