Kaushal Modi <kaushal.m...@gmail.com> writes:
> Patch (after rebasing to 5a735b0) attached. I hope it works.
Thanks. It almost works :)
Applying the patch fails because there's a whitespace change in one of
the context lines (the first one above the org-table-align change). You
should be able to see the same failure on your end if you make a test
branch off of maint and then try to apply your patch. But the patch
applies fine with the --ignore-whitespace flag to git am, so there is no
need to resend it.
I'll have another look at the changes tonight and will push it then
unless there are more comments from me or others.
> Git newbie question:
>
> Making the changes in the maint version of these 4 files manually was a bit
> of a pain. What's the right way of porting changes from one branch to
> another?
You can rebase the patch branch from master to maint. From Magit, you
can use the magit-rebase-subset command ("rs"). From the command line,
you could do something like
git rebase --onto maint master <patch-branch>
Since in this case the branch only consists of one commit, you could
also just make a new branch off of maint and cherry pick the commit from
the original branch.
In either case, Git will let you know if there are any conflicts you
need to resolve.
> I am curious how the changes will be ported from the maint branch
> to the master branch.
I'll merge maint into master.
--
Kyle
