FJCC commented on pull request #29:
URL: https://github.com/apache/openoffice-docs/pull/29#issuecomment-798987944


   Keith,
   That sounds good.
   I saw Git was complaining about conflicts and I was surprised. I thought I
   forked the repository, did all the changes on my system and then pushed
   them back up. Maybe someone else modified the branch on origin?
   If you turn on change tracking on the Base chapter, make sure you save a
   backup copy first. As I mentioned earlier, there is something pathological
   about that chapter, at least on my system.
   I may start working on the Writer Guide next. I will not let that take up
   too much time but I could use a break from the Getting Started document
   from time to time.
   
   On Sun, Mar 14, 2021 at 1:09 PM Keith N. McKenna ***@***.***>
   wrote:
   
   > There were some conflicts so I had to grap them direct from your
   > repository. Will review and make comments to them and push them back to you
   > as I do. You can then accept or reject the changes and remove comments if
   > needed and then do a committ for each chapter. Sound like a plan?
   >
   > —
   > You are receiving this because you were assigned.
   > Reply to this email directly, view it on GitHub
   > <https://github.com/apache/openoffice-docs/pull/29#issuecomment-798961800>,
   > or unsubscribe
   > 
<https://github.com/notifications/unsubscribe-auth/ACGKX6JKWWLRMNBN54Q34V3TDUCVXANCNFSM4Y637QXA>
   > .
   >
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[email protected]



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to