From 54b84b5a61d7b4cc078dcde3fdcc7c6d03e69970 Mon Sep 17 00:00:00 2001 From: SangIlMo Date: Sat, 6 Apr 2024 17:22:42 +0900 Subject: [PATCH 1/2] README: add description how to work (when fork) --- README.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/README.md b/README.md index 011edc5873f8..6090ba676188 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,42 @@ Golang execution layer implementation of the Ethereum protocol. Orakle open-source EIP team repository. +## How to Work + +### If fork + +the case for working on personal repository after fork (recommended) + +1. Setting for the first time + +``` +// add remote upstream +git remote add upstream https://github.com/orakle-opensource/EIP_opensource.git +``` +2. Working on personal repository +``` +// create branch to work +git checkout -b [branch_name] + +// rebase upstream commits into branch +git rebase upstream/master -i + +// staging and commit +git add . +git commit -m "message" + +// push +git push -u origin [branch_name] + +// go to upstream repo(https://github.com/orakle-opensource/EIP_opensource.git) and create pull request +``` +3. After merge pull request +``` +// checkout master and pull upstream commits +git checkout master +git pull upstream master +``` + ## License The go-ethereum library (i.e. all code outside of the `cmd` directory) is licensed under the From 6adc4db8007b84e691eb5a6726e41b226f4258cb Mon Sep 17 00:00:00 2001 From: SangIlMo Date: Sat, 6 Apr 2024 17:27:29 +0900 Subject: [PATCH 2/2] README: add description working with branch --- README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6090ba676188..f86a472a5540 100644 --- a/README.md +++ b/README.md @@ -35,13 +35,26 @@ git push -u origin [branch_name] // go to upstream repo(https://github.com/orakle-opensource/EIP_opensource.git) and create pull request ``` -3. After merge pull request +3. After merging pull request ``` // checkout master and pull upstream commits git checkout master git pull upstream master ``` +### If branch + +the case for working by creating branch on our repository + +``` +// create branch -> commit -> push +git checkout -b [branch_name] +git add . | git commit -m "message" +git push -u origin [branch_name] + +// go to repo and create pull request +``` + ## License The go-ethereum library (i.e. all code outside of the `cmd` directory) is licensed under the