Giter VIP home page Giter VIP logo

Comments (17)

cfries avatar cfries commented on August 17, 2024 1

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.

from ercs.

lightclient avatar lightclient commented on August 17, 2024 1

@TtheBC01 you're right, thank you.

from ercs.

lightclient avatar lightclient commented on August 17, 2024 1

You can also do that if you prefer.

from ercs.

cfries avatar cfries commented on August 17, 2024 1

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.

from ercs.

zakrad avatar zakrad commented on August 17, 2024

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

from ercs.

TtheBC01 avatar TtheBC01 commented on August 17, 2024

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

from ercs.

TtheBC01 avatar TtheBC01 commented on August 17, 2024

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?

from ercs.

Xeway avatar Xeway commented on August 17, 2024

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

from ercs.

github-actions avatar github-actions commented on August 17, 2024

There has been no activity on this issue for 1 week. It will be closed after 3 months of inactivity.

from ercs.

github-actions avatar github-actions commented on August 17, 2024

There has been no activity on this issue for 1 week. It will be closed after 3 months of inactivity.

from ercs.

github-actions avatar github-actions commented on August 17, 2024

This issue was closed due to inactivity. If you are still pursuing it, feel free to reopen it and respond to any feedback.

from ercs.

github-actions avatar github-actions commented on August 17, 2024

There has been no activity on this issue for 1 week. It will be closed after 3 months of inactivity.

from ercs.

18211308 avatar 18211308 commented on August 17, 2024

Член

...

from ercs.

github-actions avatar github-actions commented on August 17, 2024

There has been no activity on this issue for 1 week. It will be closed after 3 months of inactivity.

from ercs.

18211308 avatar 18211308 commented on August 17, 2024

член

...

?

from ercs.

github-actions avatar github-actions commented on August 17, 2024

There has been no activity on this issue for 1 week. It will be closed after 3 months of inactivity.

from ercs.

Related Issues (18)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.