Reply to thread

Message

<blockquote data-quote="MJGraf" data-source="post: 1026693" data-attributes="member: 17886">Hi Tommy,that's interesting - thanks! But maybe I didn't understand the rebase part, yet, sorry...I creat the SQLite branch based on dev and push the SQLite code as it is now (SQLite disabled, SQLCE enabled).Then I create a second branch SQLite_ENABLED based on the SQLite branch and just push one commit to the SQLite_ENABLED branch where I enable SQLite and disable SQLCE.Now what I'm using for development for future fixes is apparently a local copy of SQLite_ENABLED. But when I get your suggestion right, the fix shouldn't be pushed to the remote SQLite_Enabled, but to the remote SQLite?!?If so, I understand that I only have to rebase the one commit in SQLite_ENABLED to the latest commit of SQLite to keep it up to date. But to my understanding this doesn't help if I want to keep SQLite (and SQLite_ENABLED) up to date with DEV. I would have to rebase SQLite to the latest DEV from time to time to keep it up to date. But then I have probably broken SQLite_ENABLED because SQLite's history was rewritten?!? And I can't rebase SQLite_ENABLED to DEV because the code of the SQLitePlugin is neither contained in DEV nor in SQLite_ENABLED (the original source push was only to SQLite).Maybe I'm getting this completely wrong - as mentioned, I'm a newby to Git...Thanks for your help!Michael</blockquote>

[QUOTE="MJGraf, post: 1026693, member: 17886"] Hi Tommy, that's interesting - thanks! But maybe I didn't understand the rebase part, yet, sorry... I creat the SQLite branch based on dev and push the SQLite code as it is now (SQLite disabled, SQLCE enabled). Then I create a second branch SQLite_ENABLED based on the SQLite branch and just push one commit to the SQLite_ENABLED branch where I enable SQLite and disable SQLCE. Now what I'm using for development for future fixes is apparently a local copy of SQLite_ENABLED. But when I get your suggestion right, the fix shouldn't be pushed to the remote SQLite_Enabled, but to the remote SQLite?!? If so, I understand that I only have to rebase the one commit in SQLite_ENABLED to the latest commit of SQLite to keep it up to date. But to my understanding this doesn't help if I want to keep SQLite (and SQLite_ENABLED) up to date with DEV. I would have to rebase SQLite to the latest DEV from time to time to keep it up to date. But then I have probably broken SQLite_ENABLED because SQLite's history was rewritten?!? And I can't rebase SQLite_ENABLED to DEV because the code of the SQLitePlugin is neither contained in DEV nor in SQLite_ENABLED (the original source push was only to SQLite). Maybe I'm getting this completely wrong - as mentioned, I'm a newby to Git... Thanks for your help! Michael [/QUOTE]

Verification