On Monday, April 25, 2016 at 9:35:12 AM UTC+2, Pau Deluca wrote: > > My question now is: > > > HOW DO I MERGE BOTH, SO THE UPDATED STRINGS CONTAINED IN THE OUTDATED FILE > REPLACE THE OUTDATED STRINGS IN THE UPDATED FILE WHILE KEEPING THE NEWLY > ADDED? >
I'm sure, you just want to highlight the above statement. .. but it actually means that you are shouting <https://en.wikipedia.org/wiki/All_caps#Computing>;) > I have unsuccessfully tried a couple of things in node, but I don't want > to cause any mess I can't handle in the repository while I'm still pushing > commits to the spanish edition. > Yea, that's a problem, all translators have. Keeping track can be a bit overwhelming. but IMO the best way is to use your github branch only, for incremental updates. We don't have a good way to sync with the translators edition, if there are pending pull requests, that are not merged yet. So the best way is to just push to the pending PR on github. Github will add them as long as the PR is not merged. If Jeremy merges the stuff and publishes new translators edition everything is in sync again. have fun! mario -- You received this message because you are subscribed to the Google Groups "TiddlyWiki" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/tiddlywiki. To view this discussion on the web visit https://groups.google.com/d/msgid/tiddlywiki/43f9d4df-8470-465d-9c67-76c9a8665119%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
