ERCs Migrating Pull Requests from `ethereum/EIPs` to `ethereum/ERCs`

If you are trying to move a PR you made to ethereum/eips over to ethereum/ercs, the steps below will guide you through the process:

Fork this repository within GitHub:
1. Navigate to ethereum/ERCs.
2. Find the "Fork" button in the upper right side of the screen and click it.
3. Proceed with repository creation.
Clone your fork locally:
1. git clone https://github.com/{user}/ercs
Enter the newly created ercs folder:
1. cd ercs
Add your fork of the EIPs repository as a remote:
1. git remote add eips https://github.com/{user}/eips
Fetch that remote to download your branches:
1. git fetch eips
Now checkout the branch related to your original PR:
1. git checkout {branch}
Rebase your branch against the ERCs repo:
1. git rebase master
2. Please note, you do not need to update any references of EIP to ERC; particularly in the relative links. Even though [ERC-X](./eip-x.md) doesn't correctly render in this repository, we're currently building the full eips.ethereum.org still in the ethereum/eips repository. So until we resolve this in #1, we will continue using this relative linking format.
Push your branch to your ERCs fork:
1. git push -u origin {branch}
Now you can recreate your pull request:
1. Navigate to https://github.com/ethereum/ERCs/compare
2. Select your newly created fork and branch
3. open a new PR to this repo.

Additional notes:

Do NOT link to ERCs using their filename. Link to ERCs using [ERC-XXXX](./eip-XXXX.md).

Oct 25 '23 21:10 lightclient

If you are trying to move a PR you made to ethereum/eips over to ethereum/ercs, the steps below will guide you through the process:

1. Fork this repository within GitHub:
   
   1. Navigate to [ethereum/ERCs](https://github.com/ethereum/ERCs).
   2. Find the "Fork" button in the upper right side of the screen and click it.
   3. Proceed with repository creation.

2. Clone your fork locally:
   
   1. `git clone https://github.com/{user}/ercs`

3. Enter the newly created `ercs` folder:
   
   1. `cd ercs`

4. Add your fork of the EIPs repository as a remote:
   
   1. `git add remote eips https://github.com/{user}/eips`

5. Fetch that remote to download your branches:
   
   1. `git fetch eips`

6. Now checkout the branch related to your original PR:
   
   1. `git checkout {branch}`

7. Rebase your branch against the ERCs repo:
   
   1. `git rebase master`

8. Push your branch to your ERCs fork:
   
   1. `git push -u origin {branch}`

9. Now you can recreate your pull request:
   
   1. Navigate to https://github.com/ethereum/ERCs/compare
   2. Select your newly created fork and branch
   3. open a new PR to this repo.

Its git remote add eips https://github.com/{user}/eips in step 4

Oct 26 '23 12:10 zakrad

Step number 7 will likely create conflicts because the folders inside assets have been renamed from eip-NNNN to erc-NNNN. Isn't it?

Note: If step 7 fails the following worked from me: create a new branch (branching from master (ERC)), then manually cherry pick from the eip branch to the erc branch.

Oct 26 '23 12:10 cfries

I think in step 4 of your instructions you need to flip remote and add around

Oct 26 '23 20:10 TtheBC01

@TtheBC01 you're right, thank you.

Oct 26 '23 20:10 lightclient

is it ok to just fork the new ERCs repo, add our ERC under the number that was assigned from the EIP repo and create a new PR? or is it preferred to stick to this rebasing procedure?

Oct 26 '23 20:10 TtheBC01

You can also do that if you prefer.

Oct 26 '23 20:10 lightclient

I mentioned this before, but what worked for me was to do everything up to step 7, then, not rebasing, creating a new branch for the PR from ERC master, then chery-picking manually all changes from the EIP pull request branch.

Step 7 did not work because I got conflicts due to the renaming of the folders.

Oct 27 '23 07:10 cfries

For 8.i., the command that worked for me is git push origin HEAD:{branch}