Re: [1-800-GIT-HELP] Pushing a merge with master to a branch fails with git gcc-verify

2020-10-28 Thread Thomas Koenig via Gcc
Hi, Don't use git gcc-verify for development branches or user branches, it checks the rules required for release branches and the trunk only. Other branches have different rules. Thanks to everybody for their help. I have now pushed the merge to the branch successfully. I'm glad that the par

Re: [1-800-GIT-HELP] Pushing a merge with master to a branch fails with git gcc-verify

2020-10-28 Thread Jakub Jelinek via Gcc
On Wed, Oct 28, 2020 at 06:53:35PM +0100, Thomas Koenig via Gcc wrote: > I tried to update the coarray_native branch to current master with > "git merge master" as given by > > https://gcc.gnu.org/gitwrite.html#branches > > That worked without any error message. > > Next, I tried to verify that

Re: [1-800-GIT-HELP] Pushing a merge with master to a branch fails with git gcc-verify

2020-10-28 Thread Iain Sandoe via Gcc
Thomas Koenig via Gcc wrote: I tried to update the coarray_native branch to current master with "git merge master" as given by https://gcc.gnu.org/gitwrite.html#branches That worked without any error message. Next, I tried to verify that a "git push" would succeed, and got an error: $ git g

Re: [1-800-GIT-HELP] Pushing a merge with master to a branch fails with git gcc-verify

2020-10-28 Thread Andre Vehreschild
Hi Thomas, at work we usually do not merge master back into a dev branch, but use 'git rebase -i master'. This will so to say stash any commits on the dev-branch, i.e. roll it back, then apply all changes of master and then apply the stashed changes again. This should allow to bypass any server s

[1-800-GIT-HELP] Pushing a merge with master to a branch fails with git gcc-verify

2020-10-28 Thread Thomas Koenig via Gcc
I tried to update the coarray_native branch to current master with "git merge master" as given by https://gcc.gnu.org/gitwrite.html#branches That worked without any error message. Next, I tried to verify that a "git push" would succeed, and got an error: $ git gcc-verify Checking bf6dad60c338a