[Insight-developers] Commit fix to 3.20 branch. Sorry to ask again

[Johnson, Hans J]

Brad,

I must be missing something.

[hjohnson at hjhomebuildbox Insight (v3.21.0 *$)]$ git gerrit-merge
git: 'gerrit-merge' is not a git command. See 'git --help'.
[hjohnson at hjhomebuildbox Insight (v3.21.0 *$)]$



=========
Also,  What do I do about  the following so that I don't really screw
things up?

hjohnson at hjhomebuildbox Insight (v3.21.0 *$)]$ git status
# On branch v3.21.0
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working
directory)
#
# modified:   Testing/Data (new commits)
#
no changes added to commit (use "git add" and/or "git commit -a")


Thanks,
Hans


On 2/25/11 8:34 AM, "Brad King" <brad.king at kitware.com> wrote:

>On 2/25/2011 9:05 AM, Bradley Lowekamp wrote:
>> I have not done it for a while. The general idea was to branch a topic
>> off of the v3.20 tag, so ideally that could be merged into either the
>> release or the master then, however due to the numerous changes it is
>> extremely unlikely that it could be a clean merge.
>
>From the main development instructions:
>
>  http://www.itk.org/Wiki/ITK/Git/Develop#Create_a_Topic
>  "If you are fixing a bug in the latest release then substitute
>   origin/release for origin/master."
>
>The rest is the same after that, all the way through the
>gerrit-merge step (merging into master).  Then at the end you
>email me to ask for it to be merged to release too.
>
>-Brad



________________________________
Notice: This UI Health Care e-mail (including attachments) is covered by the Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is confidential and may be legally privileged.  If you are not the intended recipient, you are hereby notified that any retention, dissemination, distribution, or copying of this communication is strictly prohibited.  Please reply to the sender that you have received the message in error, then delete it.  Thank you.
________________________________