On 4/14/21 3:28 PM, Mark Wielaard wrote:
Hi,
I got a "pull request" for one of my packages and wanted to make some
changes to discuss with the submitter and see if we could merge it
back with those changes to the rawhide branch. But somehow I did
something wrong and I am not sure what or how to fix it.
So I saw this webpage with the suggested change:
https://src.fedoraproject.org/rpms/valgrind/pull-request/4
I added the following line to my .git/config at the end of the [remote
"origin"] section to be able to pull it:
fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
Then git pulled and checkout pr/4, made the changes, committed them
and pushed them back, hoping that would update the pr.
But it didn't, apparently I created a new origin/pr/4 branch, which I
am now unable to delete because:
$ git push origin --delete pr/4
remote: Branch deletion is not allowed
remote: Denied push for ref 'refs/heads/pr/4' for user 'mjw'
remote: All changes have been rejected
To ssh://pkgs.fedoraproject.org/rpms/valgrind
! [remote rejected] pr/4 (pre-receive hook declined)
error: failed to push some refs to 'ssh://pkgs.fedoraproject.org/rpms/valgrind'
What did I do wrong and how do I fix this?
Thanks,
Mark
1. You clone the forked repository
2. You checkout the branch where the modification has been made
3. You edit the files you want to change
4. You commit (or amend) the new changes
5. You push (or force push) the commit
6. Your commit will appear in the Pull Request ar "Rebased blah blah"
7. Merge your changes
_______________________________________________
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
