[jira] [Created] (INFRA-10745) [git] issue with renaming branches

["Sangjin Lee (JIRA)" <ji...@apache.org>]

Sangjin Lee created INFRA-10745:
-----------------------------------

             Summary: [git] issue with renaming branches
                 Key: INFRA-10745
                 URL: https://issues.apache.org/jira/browse/INFRA-10745
             Project: Infrastructure
          Issue Type: Task
          Components: Git
            Reporter: Sangjin Lee
            Priority: Critical


I am in the middle of rebasing our feature branch (YARN-2928), and am hitting a snag. I was wondering if I can get help from you.

When I completed rebase locally and tried to force push, it was rejected because it was a "non-fast-forward" change:
{noformat}
$ git push origin YARN-2928 --force-with-lease
Username for 'https://git-wip-us.apache.org': sjlee
Password for 'https://sjlee@git-wip-us.apache.org': 
Counting objects: 3383, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (1462/1462), done.
Writing objects: 100% (3383/3383), 663.93 KiB | 0 bytes/s, done.
Total 3383 (delta 1296), reused 1789 (delta 672)
remote: error: denying non-fast-forward refs/heads/YARN-2928 (you should pull first)
To https://git-wip-us.apache.org/repos/asf/hadoop.git
 ! [remote rejected] YARN-2928 -> YARN-2928 (non-fast-forward)
error: failed to push some refs to 'https://git-wip-us.apache.org/repos/asf/hadoop.git'
{noformat}

Now I'm trying to swap the branches via renaming, and that's not going through either. First, I pushed a new branch for the result of this rebase as "YARN-2928-rebase" (commit: 28fc7b14040f7d7584495e3f9b157d1e647876f7). I also pushed a new branch for the old YARN-2928 branch as "YARN-2928-old-2015-11-09" (commit: 3c4e424edc6317a17d0d339db225f98cfa80a118).

Then I was going to delete the remote YARN-2928, and rename YARN-2928-rebase into YARN-2928. But when I try to delete the remote YARN-2928, it says "delete is prohibited".

If force push doesn't work, and delete is prohibited, I'm not sure how to finish the rebase. :) Could you kindly help me navigate this safely? Thanks in advance!



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)