[latex3-commits] [git/LaTeX3-latex3-latex2e] copyedits-chris: Merge branch 'copyedits-chris' of git at github.com:latex3/latex2e.git (6f163c43)

[Frank Mittelbach]

  Chris

> 
>> though I'm a bit worried about the line
>>
>>   Conflicts:
>>   base/lthooks.dtx
>>
>> in your commit message
> 
> That is not my message.

yes it is:

you (or say your software) produced this commit

---------------
Further corrections and clarification

Conflicts:
base/lthooks.dtx
Commit:
d1373cff33fa97c10a33aca8141279804026c980 [d1373cff]
Parents:
04105ce963
Author:
Chris Rowley <car222222 at users.noreply.github.com>
Date:
7. September 2021 at 11:12:10 CEST
----------------

> 
>> --- there doesnt seem to be a conflict at origin
> 
> What is a ‘conflict at origin’?

If a marge happens and things can't be merged cleanly because changes 
overlap, then the result of the merge will be a file looking like this


<<<<<<<<<<<< one side

  foobaar

============ other side

  foo bar
  baz

 >>>>>>>>>>>>

and some human needs to resolve it by deciding it should become

  foobarbaz


if such a conflict is not cleaned up but commited to the origin (at 
github) then lthook.dtx would contain such <<<<< lines and break badly

all I was saying that your commit did't put such stuff to the github 
repo (but you may have such lines locally in your version of lthooks perhaps

> 
>> but perhaps your local copy has a conflict (ie some <<<<<<<<<< lines in it)
> Where would that be in ‘my local copy’?  copy of what?

mot likely in lthooks.dtx at your end as it claimed there are conflicts 
with this file.

> Maybe I should start again locally?
> 
> WorkingCopy is ipad, yes.

your gui should be able to tell you if your local copy is in sync with 
the remote repo or not or if you have made changes that are in conflict 
to it. But as I don't know that one I can#t tell you.

Does this check out whole branches or individual files from branches, 
because lthooks,dtx was never touched in copyedits-chris so if your 
local copy shadows that I don't see where the lthooks conflict came from

frank