Skip to content

Instantly share code, notes, and snippets.

@prasanthj
Created July 20, 2017 08:15
Show Gist options
  • Save prasanthj/c5a1d28449fbe5f8583cdaf757b7d210 to your computer and use it in GitHub Desktop.
Save prasanthj/c5a1d28449fbe5f8583cdaf757b7d210 to your computer and use it in GitHub Desktop.
Apache ORC PR merge steps
$ cat .git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[remote "origin"]
url = https://git-wip-us.apache.org/repos/asf/orc.git
fetch = +refs/heads/*:refs/remotes/origin/*
[remote "github"]
url = [email protected]:apache/orc.git
fetch = +refs/heads/*:refs/remotes/github/*
fetch = +refs/pull/*/head:refs/remotes/github/pr/*
$ git fetch github
$ git merge github/pr/<number>
$ git commit --amend
- Add "Fixes #<number>" in next line after commit message
$ git commit --amend --signoff
$ git push origin master
- PR will be closed automatically
- JIRA has to be resolved manually with appropriate fix version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment