Right now, if a user makes commits to a remote "dataform_..." branch outside of Dataform, the next time they try to push to that branch, we fail with a "cannot push non-fastforwardable reference" error, because the remote branch is ahead of the local one.
The right way to handle this would be to pull those changes back into the local branch. We could fairly easily do this by detecting when the remote branch is ahead of the local one, it's very similar to when we force the user to pull changes from "master" before allowing them to push anywhere.
BenBirt
commented
5 years ago
Right now, if a user makes commits to a remote "dataform_..." branch outside of Dataform, the next time they try to push to that branch, we fail with a "cannot push non-fastforwardable reference" error, because the remote branch is ahead of the local one.
The right way to handle this would be to pull those changes back into the local branch. We could fairly easily do this by detecting when the remote branch is ahead of the local one, it's very similar to when we force the user to pull changes from "master" before allowing them to push anywhere.