Thursday, 3 October 2013

Syncing all releases to the same commit and Tag (for TeamMentor v3.4)

This is a bit of house keeping, as you can see by the Fixing the Merge conflict caused by one extra commit on TeamMentor master  and Git Flow - Moving patches from one Commit into another Commit posts, not doing this has already cause us some pain in the past.

So after some pushes and pulls (of both commits and tags) I now have the main TeamMentor repos all synchronised at the 72ca4b5d3322901266ca294678cbe15aa343a4b3 commit:

TeamMentor/Release - now the new official home for TeamMentor releases (i.e. the 'production code')
image

TeamMentor/Master – the old TeamMentor official repo (and updated to help migrations into 3.4)

image

TeamMentor/Dev #1 (before merge 3.5_Release and 3.6_Release merges) – this is the main development clone/fork

image

TeamMentor/Dev #2 (after merge 3.5_Release and 3.6_Release merges) – note how 3.5 is currently at the same level as 3.4 (see Appendix 1 and Append 2 for how this was done, and how the merge conflicts were resolved)

image

This can be further confirmed by GitHub's Branches view, where the 3.5_Release and 3_4_Release branches are synced with master:

image

... and the 3.6_Release branch is already 131 commits ahead of master (and 3.4_Release and 3.5_Release)

image


Updating the tags/Releases

I also updated the tags of 3 repos (Release, Master, Dev).

NOTE: I had to force the update of the tags, since there was already an v3.4 tag in there (I’m not 100% sure of the side effects of this, but I’m sure I’ll soon find out :)  )

Release repo (new production release): https://github.com/TeamMentor/Release/releases

image

Master repo (legacy/previous production release) https://github.com/TeamMentor/Master/releases  (note sure why the GitHub's layout of this one is different)

image

Dev repo: https://github.com/TeamMentor/Dev/releases

image


Appendix 1: Updating 3.5 Release branch

This one was easy since the 3.5_Release branch was already synced with an earlier version of the 3.4_Release branch:

image

The push also confirms that this branch is at 72ca4b5d3322901266ca294678cbe15aa343a4b3

image


Appendix 2: Updating 3.6 Release branch

Mergeing the 3.4_Release into 3.6_Release was a bit more problematic due to the number of changes/fixes already done on 3.6 and the backporting of some fixes to 3.4.

After the merge failed, here are the conflicts that needed to be solved:

image

... with some resolved using the ‘theirs’ strategy
image

… a few using the ‘mine’ strategy

image

… and a couple using the ‘theirs first then mine’ strategy (which I expect that will need further fixing in VisualStudio

image \

\Finally here is the commit that applies all 3.4 changes to 3.6 (including the merge fixes)

image

… and the respective push:

image
Post a Comment