search

magicstone-dev / c4-tools

Maintaining community-driven forks using the Collective Code Construction Contract (C4)
GNU General Public License v3.0
8 stars 1 forks source link

Problem: local gets out of sync on upstream branch with conflicts #1

Closed weex closed 3 years ago

weex commented 3 years ago

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.

weex commented 3 years ago

Fixed by #3