contrib: add gx-rebase script

whyrusleeping / gx-go

gx subtool for golang

MIT License

80 stars 28 forks source link

contrib: add gx-rebase script #45

Closed Stebalien closed 6 years ago

Stebalien commented 6 years ago

/cc @vyzo, @magik6k, @Kubuxu, @schomatis, @kevina

Tagging so you're aware of this as it makes rebaseing on go-ipfs master a bit less painful.

Stebalien commented 6 years ago

Nevermind... Now I remember why I abandoned this before. Git sees the "unwrewrite" as a patch. That means any non-gx related import modifications (i.e., adding or removing an import) will cause a conflict.

I tried fixing this in the past with two glue commits and a graft but ran into some trouble (can't remember what exactly went wrong).

Stebalien commented 6 years ago

Note: this is still kind of useful, just not as useful.