[TYPO3-dev] GIT Problem with Rebase origin/TYPO3_4-5

[Stefan Geith]

Hi devs,

now that I have heard all 3 parts of GIT-Workshop at T3DD12,
I once again have a problem with rebasing my personal Versions
of Typo3 (only some few changes in t3lib and tslib).

With 4.6 and 4.7 all was easy with
   > git fetch --all
   > git rebase TYPO3_4-x
   > git submodule update
ready.

*But* with 4.5 I had problems:
   > git fetch --all
   > git rebase TYPO3_4-5

This leads to (Note: I never changed something in version nor 
linkvalidator):
> Auto-merging typo3/sysext/linkvalidator
> CONFLICT (submodule): Merge conflict in typo3/sysext/linkvalidator
> Auto-merging typo3/sysext/version
> CONFLICT (submodule): Merge conflict in typo3/sysext/version
> Failed to merge in the changes.

I then did
   > git submodule update
which gave me many lines of output, e.g.
> [...]
> From git://git.typo3.org/TYPO3v4/CoreProjects/workspaces/version
> [...]
>  * [new tag]         TYPO3_4-5-15 -> TYPO3_4-5-15
> [...]
> Submodule path 'typo3/sysext/version': checked out 'aeed056effa22cd8e3e099a6e024005e0f8cd120'
> Submodule path 'typo3/sysext/version': checked out '908c5556cdc03943b9cd75ef18981682d6b5febc'
> Submodule path 'typo3/sysext/version': checked out '78973bda4b797d9fa7b074afb28de00a68ead4b8'

Then I tried to continue with
   > git rebase --continue
but I got these Errors:
> You must edit all merge conflicts and then
> mark them as resolved using git add


*QUESTION*: How do I resolve this CORRECTLY ?

I tried this:
   > git reset HEAD typo3/sysext/linkvalidator
   > git reset HEAD typo3/sysext/version

   > git rebase --continue
   > git status
   > git submodule update
   > git status

After all this, I had a *somehow* rebased Version,
but what's irritating me is this output from
   > git diff origin/TYPO3_4-5
> diff --git a/typo3/sysext/linkvalidator b/typo3/sysext/linkvalidator
> index ecb88a6..9d41954 160000
> --- a/typo3/sysext/linkvalidator
> +++ b/typo3/sysext/linkvalidator
> @@ -1 +1 @@
> -Subproject commit ecb88a6cac5ed20a982e4383d85bec3fa10cea68
> +Subproject commit 9d41954755c30e9e1221ad74ff7ccc67f467f00e
> diff --git a/typo3/sysext/version b/typo3/sysext/version
> index 908c555..78973bd 160000
> --- a/typo3/sysext/version
> +++ b/typo3/sysext/version
> @@ -1 +1 @@
> -Subproject commit 908c5556cdc03943b9cd75ef18981682d6b5febc
> +Subproject commit 78973bda4b797d9fa7b074afb28de00a68ead4b8
> diff --git a/typo3/sysext/workspaces b/typo3/sysext/workspaces
> index e6f59e7..a529d1c 160000
> --- a/typo3/sysext/workspaces
> +++ b/typo3/sysext/workspaces
> @@ -1 +1 @@
> -Subproject commit e6f59e7bac441d08e04f214a8532c6548bbeb106
> +Subproject commit a529d1cc450133ed3da7d2878eb3fc7738189c93

So for me, it seems, that I now have wrong version of some
submodules - RIGHT ?

*QUESTION*: How do i "reset" now to the original and correct
version of these submodules for Typo3 4.5 ?


/Stefan