[Tuxpaint-devel] Merging sdl2.0 branch into master -- help wanted

[Bill K. <nb...@so...>]

Since the last release of Tux Paint, we've been focusing on the SDL2.0
version of the codebase (in the "sdl2.0" branch), and finally diverged
significantly from the classic SDL1.2 version of the codebase
(the "master" branch).

Specifically, a major new feature -- Stamp rotation -- exists only in
the "sdl2.0" branch.

This departure is fine, as we recently decided to stop supporting
SDL1.2. [*]  Previously, we (mostly me) had been continuing development
in "master" and Pere would merge & port the changes to SDL2.0 in the
"sdl2.0" branch.  (Thank you!)  This made the Android port possible.

The last version of Tux Paint was released as source (and in some
cases, e.g. for some versions Red Hat Enterprise Linux (RHEL), it
was built as binaries) twice -- once using the SDL1.2 "master" branch,
]and again using the SDL2.0 branch.  Moving forward, I'd like to stop
this.

And a minor problem right now is that some people are still on
"master" and making changes (e.g., translation updates in "src/po/")
in that branch, which require syncing up the files in "sdl2.0".


Therefore, I'd like to merge all the "sdl2.0" codebase into "master",
or maybe swap the branches somehow ("master" becomes "sdl1.2" and
"sdl2.0" becomes the new "master"), if there's any good reason to do
it that way instead.

Searching around Google I find a million questions, and just as many
answers; and most of them seeming to not be quite relevant to our
particular problem here.  (Also, many are GitHub-specific, and may
not apply to SourceForge, due to differences in their web UIs...?)


The following appears like the most appropriate way of just pulling
all of the "sdl2.0" code into "master", but I'm far from a Git expert,
and dare not attempt it before asking.

  git checkout sdl2.0
  git merge -s ours --no-commit master
  git commit
  git checkout master
  git merge sdl2.0

Does anyone out here have experience doing something like this?

I'd really like to avoid causing a huge mess, if possible.  And of
course, require as little work from the rest of the team as possible
(i.e., not do something that requires everyone _else_ do anything
beyond just switching [back to] "master" branch and "git pull"-ing
before making any further changes).

If no one speaks up, I'll start asking around the wider community
(e.g., my Twitter followers, maybe even folks at my Day Job(tm)).

Thanks in advance, and thanks again to Pere for doing such a good
job of keeping "sdl2.0" sync'd with "master" all these years,
and handling the Android builds!

-- 
-bill!
Sent from my computer

[*] SDL2.0 has been around since 2013, and I've recently been cluing
into the fact that SDL1.2 apps on various Linux platforms use a
compatibility later between the 1.2-based app and the 2.0 libraries,
which has caused some issues with Tux Paint which are not seen when
using 100% SDL1.2 or 100% SDL2.0.)