Page History

...

1. Review: Committers should review the pull request changes, leave comments and sigh off about whether accept the code change. (Reject/Recall/Pass)

2. Merge: merge the patch of the pull request and push the merged code to apache/incubbator-eagle (following process is temporary solution for manual merging, the automatic tool is under development  EAGLE-84)

   Info
   title Pre-requisite
   Committer(reviewer) should have already cloned repo from apache github git clone https://git-wip-us.apache.org/repos/asf/eagle.git

   git-apply 

   Code Block

   > git pull https://git-wip-us.apache.org/repos/asf/eagle.git master # get latest > wget https://patch-diff.githubusercontent.com/raw/apache/eagle/pull/19.patch && git apply 19.patch # anyway you like to get the patch and apply > # review the code; run the test; > git commit # Commit with the commit MSG described below if everything looks good > git push https://git-wip-us.apache.org/repos/asf/eagle.git master # push to upstream

   git-rebase when necessary

   Code Block
   > git pull https://git-wip-us.apache.org/repos/asf/eagle.git master # get latest > git pull https://github.com/<contributor>/eagle.git EAGLE-ID > git rebase -i # squash and modify the final committed message > git commit > git push https://git-wip-us.apache.org/repos/asf/eagle.git master

   Or git-reset

   Code Block
   language bash
   > git pull https://git-wip-us.apache.org/repos/asf/eagle.git master # get latest > git pull https://github.com/<contributor>/eagle.git EAGLE-ID > # review the code; run the test;  > git reset origin/master > git add . > git commit -a # Commit with the commit MSG described below if everything looks good > git push https://git-wip-us.apache.org/repos/asf/eagle.git master # push to upstream

   Anchor
   Commit Msg Format Commit Msg Format

   Committers should follow an convention format to add appropriate commit message. The format should be:

   Code Block
   EAGLE-${jira_id} ${title} ${description} ${jira_url} Author: @${committer_github_id} <author_email> Reviewer: @${reviewer_github_id} <reviewer_email> Closes #${pull_request_id}

    

   • Author/Reviewer could be optional when the committer is the single reviewer.
   • For example: https://github.com/apache/eagle/commit/52b8e58b1af53273782454f52e61b4f4700626c9
     
     
     
     
3. Close: Committer to close the JIRA ticket. (Pull request will be close automatically)

...