You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
When rebasing to a new version of geth, a lot of conflicts happen because of different import names.
When a new import added upstream, git gets confused. Resolving these merges is trivial, but annoying and can lead to occasionally importing actual unpatched go-ethereum module.
The text was updated successfully, but these errors were encountered:
When rebasing to a new version of geth, a lot of conflicts happen because of different import names.
When a new import added upstream, git gets confused. Resolving these merges is trivial, but annoying and can lead to occasionally importing actual unpatched go-ethereum module.
The text was updated successfully, but these errors were encountered: