On Wed, Oct 22, 2014 at 6:32 PM, Kent Brinkley <[email protected]> wrote:
> Hi Guys, > > > > Trying to re-submit a patch (after doing a “git reset”) but receive the > following error: > > > > openocd@ubuntu:~/openocd$ git push review > > Counting objects: 27, done. > > Compressing objects: 100% (19/19), done. > > Writing objects: 100% (19/19), 3.64 KiB, done. > > Total 19 (delta 16), reused 0 (delta 0) > > remote: Resolving deltas: 100% (16/16) > > remote: Processing changes: refs: 1, done > > To ssh://[email protected]:29418/openocd.git > > ! [remote rejected] HEAD -> refs/publish/master (change 2307 closed) > > error: failed to push some refs to 'ssh:// > [email protected]:29418/openocd.git' > > That's because you're basing your commits off of change 2307 which is now closed (it was a fixup commit for another change, 2306, I squashed it into that other change where it belongs). Instead, check out the latest version of the last change in the change set and rework that series of commits according to your needs, feedback etc. In your case that would be accomplished using the following command, which can be copied by clicking through in Gerrit to that last change (the topmost of the "related changes" when viewing the change you want to fix) and select Download/Checkout in the top right corner. git fetch http://openocd.zylin.com/openocd refs/changes/10/2310/2 && git checkout FETCH_HEAD You'll need to get comfortable using history rewriting in git to reorder, squash/fixup and split commits in your local repo before pushing the entire history back to Gerrit for re-review. Searching for "git interactive rebase" will turn up several useful resources, http://git-scm.com/book/en/Git-Tools-Rewriting-History is a good one. Commits in the group which have changed will appear as new versions of the same change, if the Change-Id line has been appropriately kept. The exact steps of course depends on what you're trying to do. /Andreas
------------------------------------------------------------------------------
_______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
