Kyle Meyer <kyle@kyleam.com> writes:

>> Aside: It appears to be only partially documented in
>> https://orgmode.org/worg/org-maintenance.html#emacs-sync. In particular,
>> the last two lines.
>
> I'm happy to clarify or add to those docs.  I didn't write them, but I
> did go through them somewhat recently to better align them with the
> actual porting/syncing process.
>
> With respect to the emacs-sync branch, that page currently says
>
>   Typically, Org can be synchronized by copying over files from the
>   emacs-sync branch of the Org repository to the master branch of Emacs
>   repository. The emacs-sync branch has a few extra changes compared
>   with the bugfix branch
>
> Would you like me to add more details about why the branch exists?  How
> it's managed?  Something else?

I think that a reference to
https://git.kyleam.com/orgmode-backport-notes/tree/orgmode-backports.org#n2
might be helpful. Maybe we should even have that file in the main repo
as a part of emacs-sync branch?

>> May we just add
>>
>>>   +\centerline{For more Emacs documentation, and the \TeX{} source for this card, see}
>>>   +\centerline{the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}}
>>
>> to Org repo?
>
> These lines (or rather what became these lines) were added in Emacs's
> 4af5981dc75 (Add a comment in generated refcards about the source,
> 2016-11-17).  I decided to port that commit to emacs-sync rather than a
> primary Org branch because I felt it only applied to the Org card
> distributed as part of the Emacs tree.  From my notes [*]:
>
>   I'm skipping this because it isn't true when the card is from the Org
>   mode repo.
>
> However, if you prefer to include those lines in Org's copy, that's fine
> by me.

I can see the point. Although, I feel like accumulating such divergence
may backfire after some time. May we possibly resolve the conflict
properly using something like the attached patch?
Then, we can use the same orgcard source but have orgcardemacsnotice.tex
empty in Org repository.

Are there other similar conflicts in emacs-sync branch?