I had no trouble doing git fetch and starting a feature branch, but now
that I'm ready to publish the feature branch and track it from another
machine to run more tests, it seems that some step was missed and git
complains that the branch doesn't exist on remote 'origin'
*$ git flow feature start GEODE-94*
Switched to a new branch 'feature/GEODE-94'
Summary of actions:
- A new branch 'feature/GEODE-94' was created, based on 'develop'
- You are now on branch 'feature/GEODE-94'
Now, start committing on your feature. When done, use:
git flow feature finish GEODE-94
*$ git status*
On branch feature/GEODE-94
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified:
gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java
modified:
gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/FRAG2.java
modified:
gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/SMACK.java
modified:
gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/UDP_NIO.java
modified:
gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/VIEW_ENFORCER.java
Untracked files:
(use "git add <file>..." to include in what will be committed)
GEODE-97.diff
no changes added to commit (use "git add" and/or "git commit -a")
*$ git add
gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java
gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/FRAG2.java
gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/SMACK.java
gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/UDP_NIO.java
gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/VIEW_ENFORCER.java*
*$ git commit*
[feature/GEODE-94 2adb158] GEODE-94: Add typecast to prevent ambiguous
method calls under JDK 8
5 files changed, 6 insertions(+), 7 deletions(-)
*$ git log*
commit 2adb1588cce967c2a4149fa674d431871a3066fd
Author: Kirk Lund <[email protected]>
Date: Mon Jul 13 11:44:21 2015 -0700
GEODE-94: Add typecast to prevent ambiguous method calls under JDK 8
Add typecast to Object for ambiguous logger arguments.
*$ git flow feature publish GEODE-94*
fatal: unable to access '
https://git-wip-us.apache.org/repos/asf/incubator-geode.git/': Unknown SSL
protocol error in connection to git-wip-us.apache.org:443
Fatal: Could not fetch branch 'feature/GEODE-94' from remote 'origin'.
Our notes imply that "git flow feature publish GEODE-nn" is the same git
push -u origin feature/GEODE-nn but this seems to be incorrect. It seems
like git is complaining that no such branch exists on remote 'origin' which
means we're missing a "push" in our workflow writeup. It would seem that
there must be a push *BEFORE *attempting "git flow publish GEODE-nn."
Here are the relevant steps in our workflow writeup (something is obviously
missing):
5) start the feature branch for GEODE-nn
git flow feature start GEODE-nn
*Without git flow:*
*git checkout develop*
*git pull --rebase*
*git checkout -b feature/GEODE-nn*
6) work on the changes and tests for GEODE-nn (include GEODE-nn in commit
messages)
7) [optional] publish the feature branch to share with others or other
machine
git flow feature publish GEODE-nn
*Without git flow:*
*git push -u origin feature/GEODE-nn*
-Kirk
