On 2020/12/18 12:56:06, Dick Groskamp <di...@apache.org> wrote:
> Back in February I started working on removing superfluous whitespace between
> tags <bookmark> in files in the folder Helpcontent2.
> These files contain the content for the Help files in AOo. In the very past
> superfluous whitespace was introduced by former participants, probably to
> make the code in the files more readable.
>
> However, in the application POOTLE, which we use for translating the Help
> files, these whitespace needlessly shows up in the segments to translate.
> This creates confusion for the translators whether they should remove the
> whitespace or not. Removing it will instantiate errors in POOTLE.
>
> Removing these whitespaces would bring the original segments in sync with
> translated ones in terms of formatting. It should also removed unneccessary
> warnings/errors in Pootle. The changes I made are only to text, no coding,
> also some typo's corrected if I can across them.
>
> Starting this was also my first attempt to try using GIT. Obviously I made
> some mistakes, for instance by not incorporating all changes in one commit
> but acrosse several, but I had no idea how many changes GIT could handle in
> one time. Now I'm ended up with four outstanding PR's which should contain my
> changes and are waiting to be incorporated.
>
> Today I had another look at the changes for PR 74 by fetching upstream trunk
> to my local fork.
> Then I merged upstream trunk to my local fork.
> Checked out to branch Latest and rebased that.
>
> Now I need help to continue.
> How can I integrate my changes in upstream trunk/main/source/helpcontent2
> Can I do that myself or does someone has to approve my PR and have a look at
> it.
>
> Or would it be more simple to start over en delte the old PR's ?
>
> Greetings,
> Dick
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
> For additional commands, e-mail: dev-h...@openoffice.apache.org
>
>
I should have mentioned that there was 1 conflict, which I resolved.
Should I now again do git commit or not ?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org
