Tech Wiki

This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.
=== Contribute to github ===
  - configure local git<code>
 $ git config --global user.name "Frank Deng"
 $ git config --global user.email "frank.deng@oracle.com"
</code>
  - fork a repo on github.com
  - clone repo<code>

 $ git clone https://github.com/frdeng/oraclelinux.git
</code>
  - add upstream to your repo<code>
 $ git remote add upstream https://github.com/boxcutter/oraclelinux.git
 $ git remote -v
</code>
  - fetch upstream<code>
 $ git fetch upstream
</code>
  - set upstream branch<code>
 $ git branch --set-upstream-to=upstream/master master
</code>
  - create new branch for changes<code>
 $ git checkout -b newfix
</code>
  - make code changes
  - add changes<code>
 $ git add .
</code>
  - commit changes<code>
 $ git commit -m "comments"
</code>
  - push to origin<code>
 $ git push --set-upstream origin newfix
</code>
  - create new pull request on github.com
  - Once PR is accepted, the fix is merged to upstream, then sync up with upstream. Fetch upstream, and rebase upstream, then push to own forked repo(origin><code>
$ git checkout master
$ git fetch upstream
$ git rebase upstream/master
$ git push origin master
</code>

=== get remote release branch ===
<code>
$ git branch --track remotes/origin/release-3.1
</code>

=== get diff between branches ===
<code>
$ git diff release-3.1..master -- version/
diff --git a/version/version.go b/version/version.go
index 6cb3c08..9134ceb 100644
--- a/version/version.go
+++ b/version/version.go
@@ -26,7 +26,7 @@ import (
 var (
        // MinClusterVersion is the min cluster version this etcd binary is compatible with.
        MinClusterVersion = "3.0.0"
-       Version           = "3.1.0+git"
+       Version           = "3.2.0+git"
        APIVersion        = "unknown"
 
        // Git SHA Value will be set during build

</code>
Tech Wiki

User Tools

Site Tools

Page Tools
