DocBook v2

[Richard Kimberly Heck]

On 8/31/20 11:42 AM, Thibaut Cuvelier wrote:
> On Mon, 31 Aug 2020 at 17:17, Kornel Benko <kornel at lyx.org
> <mailto:kornel at lyx.org>> wrote:
>
>     Am Mon, 31 Aug 2020 16:44:33 +0200
>     schrieb Thibaut Cuvelier <tcuvelier at lyx.org
>     <mailto:tcuvelier at lyx.org>>:
>
>     > Locally, Git says everything's alright:
>     >
>     > Thibaut at MSI MINGW64 /d/LyX/lyx-unstable (feature/docbook)
>     > $ git push --force
>     > Enumerating objects: 2774, done.
>     > Counting objects: 100% (2774/2774), done.
>     > Delta compression using up to 12 threads
>     > Compressing objects: 100% (1572/1572), done.
>     > Writing objects: 100% (2274/2274), 2.62 MiB | 1.74 MiB/s, done.
>     > Total 2274 (delta 1908), reused 728 (delta 702), pack-reused 0
>     > remote: postdrop: warning: uid=1005: File too large
>     > remote: sendmail: fatal: tcuvelier at lyx.org
>     <mailto:tcuvelier at lyx.org>(1005): message file too big
>     > To git.lyx.org:features.git
>     >  + f46fb80512...d268809f2e feature/docbook -> feature/docbook
>     (forced update)
>     >
>     > Thibaut at MSI MINGW64 /d/LyX/lyx-unstable (feature/docbook)
>     > $ git push --force
>     > Everything up-to-date
>     >
>     > I did not touch master for now, I prefer to have some feedback
>     and a more formal OK
>     > before doing so.
>     >
>
>     The problem I see is that the log in your branch does not show
>     any commits (from other devs than you) newer than Aug. 3.
>     commit 8415041b
>     Author:     Juergen Spitzmueller <spitz at lyx.org
>     <mailto:spitz at lyx.org>>
>     AuthorDate: Mon Aug 3 14:10:46 2020 +0200
>     Commit:     Juergen Spitzmueller <spitz at lyx.org
>     <mailto:spitz at lyx.org>>
>     CommitDate: Mon Aug 3 14:10:46 2020 +0200
>
>     But in master there are 213 newer commits which are not in the log
>     of features/docbook.
>
>
> Better this way? It looks like I did not fetch all commits previously…
> Here is the last non-DocBook commit:
>
> commit 3c25899eab265aa8d5ca6af48b669650dff34298 (official/master, master)
> Author: Richard Kimberly Heck <rikiheck at lyx.org <mailto:rikiheck at lyx.org>>
> Date:   Mon Aug 31 11:20:49 2020 -0400
>
>     Improved fix for edit button

As Kornel said, this looks good.

Generally, it's a good idea to do "git fetch origin" and then "git
rebase origin/master" daily. You should not see many conflicts, if any,
given what you are doing. But if you do see any, then fixing them daily
makes life much simpler.

Riki


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20200831/456b5f6c/attachment.html>