[
https://issues.apache.org/jira/browse/HBASE-11998?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14163100#comment-14163100
]
Sean Busbey commented on HBASE-11998:
-------------------------------------
{quote}
do a <command>git pull</command> command,
{quote}
This should be either {{git pull --rebase}} or {{git fetch}} followed by {{git
rebase}}. Generally I prefer fetch/rebase, but it'll be longer to explain. This
is generally true where ever we have {{git pull}} listed. Might be better to
just say "make sure your local branch has all remote changes" and add a brief
paragraph that explains how to do that.
{quote}
+ <para>One thing you will notice with these
examples is that there
+ are a lot of <command>git pull</command>
commands. The only
+ command that actually writes anything to
the remote repository
+ is <command>git push</command>, and you
need to make absolutely
+ sure you have the correct versions of
everything and don't have
+ any conflicts before pushing. The extra
<command>git
+ pull</command> commands are usually
redundant, but better
+ safe than sorry.</para>
{quote}
Worth pointing out that if you don't have all the changes, the push will fail?
Maybe with an example and a warning to update locally rather than do a force
push?
> Document a workflow for cherry-picking a fix to a different branch
> ------------------------------------------------------------------
>
> Key: HBASE-11998
> URL: https://issues.apache.org/jira/browse/HBASE-11998
> Project: HBase
> Issue Type: Bug
> Components: documentation
> Reporter: Misty Stanley-Jones
> Assignee: Misty Stanley-Jones
> Attachments: HBASE-11998-v1.patch, HBASE-11998.patch
>
>
> We are not all git experts and it will be helpful to have a workflow
> documented, understanding that there are about a million ways to do
> everything in git.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
