Problem: branch is pushed even in case of conflicts

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: branch is pushed even in case of conflicts #2

Closed weex closed 3 years ago

weex commented 3 years ago

If the source pull request has conflicts, c4pr.sh runs past errors and pushes a new branch with merge conflicts that are better handled upstream first.

Example: https://github.com/weex/mastodon/pull/78