How to synchronize a git branch with master?
I currently have a git repository at github that stores the packaging files for a bunch of packages with a directory structure like this:

    package-a
      `- PKGBUILD
    package-b
      `- PKGBUILD
    package-c
      `- PKGBUILD
    xorg
      `- PKGBUILD
    libx11
      `- PKGBUILD

I created an experimental branch, `newxorg`, that contains packaging files for a new version of `xorg` and `libx11` and also updated `package-a` and `package-b` on `master`. My history is something like this:

    M1 -- M2 -- M3 -- M4
           \
            B1 -- B2

    where:
    B1 = "Update xorg"
    B2 = "Update libx11"
    M3 = "Update package-a"
    M4 = "Update package-b"

Ideally, I'd like my new branch to contain the `M3` and `M4` commits from `master`, like this:

    M1 -- M2 -- M3 -- M4
                       \
                        B1 -- B2

But the problem is that I've already pushed both `master` and the `newxorg` branch to the remote github server. Since people have already cloned the new branch, I'm guessing a rebase would really screw things up for them. What would be the best way to merge the new commits from master?
How to synchronize a git branch with master?
===

I currently have a git repository at github that stores the packaging files for a bunch of packages with a directory structure like this:

    package-a
      `- PKGBUILD
    package-b
      `- PKGBUILD
    package-c
      `- PKGBUILD
    xorg
      `- PKGBUILD
    libx11
      `- PKGBUILD

I created an experimental branch, `newxorg`, that contains packaging files for a new version of `xorg` and `libx11` and also updated `package-a` and `package-b` on `master`. My history is something like this:

    M1 -- M2 -- M3 -- M4
           \
            B1 -- B2

    where:
    B1 = "Update xorg"
    B2 = "Update libx11"
    M3 = "Update package-a"
    M4 = "Update package-b"

Ideally, I'd like my new branch to contain the `M3` and `M4` commits from `master`, like this:

    M1 -- M2 -- M3 -- M4
                       \
                        B1 -- B2

But the problem is that I've already pushed both `master` and the `newxorg` branch to the remote github server. Since people have already cloned the new branch, I'm guessing a rebase would really screw things up for them. What would be the best way to merge the new commits from master?