Porting offline functionality from expo to react-naative #318
Conversation
|
Please reopen against master. |
|
this was opened against master |
|
You can see on the top that it wasn't, which is also the reason for part of the conflicts:
|
|
When I try to create a new pull request against master branch - it's
showing this pull request as already existing and I cannot create anything
…On Fri, 20 Jul 2018, 20:52 Jaka Kranjc, ***@***.***> wrote:
You can see on the top that it wasn't, which is also the reason for part
of the conflicts:
aleksandr-wemakesoftware wants to merge 20 commits into
letsdoitworld:react-native-app-prototype from
aleksandr-wemakesoftware:react-native-app-offline
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
<#318 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AkU-pkGUKC_spDQFPWkX8_3bqMOvO2QWks5uIhjSgaJpZM4VNol8>
.
|
|
|
|
The pic explains the problem — it's from the rewrite and subsequent forced branch swap, since there's no shared history between the branches anymore. I'll now go update this branch with the new stuff in master and then you can more easily resolve the conflicts... and once the process is done, the merged code can be transplanted back to master. |
|
Nobody did actually explain why this move (wiping the entire history of commits) was really necessary.
Such painful transition should have been synchronised with all involved developers.
Without the history it can take a *while* to merge everything back in.
… On 20 Jul 2018, at 22:31, Jaka Kranjc ***@***.***> wrote:
The pic explains the problem — it's from the rewrite and subsequent forced branch swap, since there's no shared history between the branches anymore. I'll now go update this branch with the new stuff in master and then you can more easily resolve the conflicts... and once the process is done, the merged code can be transplanted back to master.
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub <#318 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AkU-pkApyNWS4ZIdkxWgL5rE3Pe5822Vks5uIjAdgaJpZM4VNol8>.
|
|
Rest assured, I'm not happy with it either (at all) — it was basically a fork. But you can see the old master & history in the master-expo branch. |
|
Part of the problem is that #299 got merged to the prototype branch, but is not present in the final code. I'll open a separate issue, this is where most of the conflicts here stem from. |
No description provided.