Re: iCalendar support: reply to invitations, sync to org

[Steinar Bang <sb@dod.no>]

> On Fri, 07 Jun 2013 14:13:27 +0200 Jan Tatarik <jan.tatarik@gmail.com> wrote: 

JT> If it makes the merge process easier, I will simply clone the original
JT> repo instead of the emacsmirror one, and continue development against
JT> that.

You don't have to clone the original repo, I think...?

The first thing I would have tried, is something like this:
 - Preserve any outstanding changes you might have
    git stash
   (recover afterwards with "git stash pop")
 - Add the Gnus git repo as a remote and fetch its content
    git remote add gnus-repo http://git.gnus.org/gnus.git
    git fetch gnus-repo
 - Check out the Gnus master branch and test merge your changes against
   this branch
    git checkout -b gnus-master --track gnus-repo/master
    git merge --no-ff --no-commit origin/icalendar

Then you inspect the working directory with eg. magit (recommended!) and
check that what's in there are just your diffs.

Next step then would be to merge in the current Gnus master into your
branch:
 - First clear out the results from the merge
    git reset --hard gnus-repo/master
 - Then merge the Gnus master HEAD into your branch
    git merge gnus-repo/master
 - Build clean and test the Gnus

After this, your icalendar branch is up to date with Gnus master, and
any merges from your branch into Gnus master should be problem free
(ie. you won't have to re-merge before submitting... unless they
completely reorganize the Gnus directory structure in the meantime).