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

[Frank Mittelbach]

Am 07.09.21 um 16:28 schrieb Chris Rowley:
> 
>> On 7 Sep 2021, at 20:07, Frank Mittelbach <frank.mittelbach at latex-project.org> wrote:
>>
>> the way it looks to me is that you started from the second latest check-in of copyedits-chris branch not from its head
> Possibly, but how would I have known that,

  - depending on the gui you use you simply see it, eg see screen shot

   and what could I have done differently?

  - make sure you are working from the head of a branch
  - if the branch has updates at origin merge them into your local copy
    (before uploading or before working further on it)

> 
>> then added "Further corrections and clarifications"
> 
> I did that, but it had nothing to do with ltnews34!

that was me adding the comma to ltnews34 (as requested by Dr. Rowley)
that must have happened after you made your local copy, but you should 
have gotten a checkin message and (depending on the gui you use you see 
if your local version of the branch is behind its its head)
> 
>> and when you uploaded that it merged it with the head of the branch (and perhaps generated this merge info)
> 
> Err, OK!  So is everything in this branch correct now?

it looks like it, though I'm a bit worried about the line

   Conflicts:
   base/lthooks.dtx

in your commit message --- there doesnt seem to be a conflict at origin 
but perhaps your local copy has a conflict (ie some <<<<<<<<<< lines in it)

>> ... no idea what gui you used
> 
> Most likely WorkingCopy.

don't know that one, is it an ipad one?

-------------- next part --------------
A non-text attachment was scrubbed...
Name: Screenshot 2021-09-07 at 16.35.06.png
Type: image/png
Size: 439087 bytes
Desc: not available
URL: <https://tug.org/pipermail/latex3-commits/attachments/20210907/c7b724e7/attachment-0001.png>