[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: texinfo-6.5.90 pretest
From: |
Gavin Smith |
Subject: |
Re: texinfo-6.5.90 pretest |
Date: |
Sun, 13 Jan 2019 11:50:01 +0000 |
> I'd also like to get rid of the gsoc-2017 branch. Ideally by merging
> it with the "master branch", although the work on the gsoc-2017 branch
> exists already in the master branch, just without the full history.
> I'm not sure what the best way is to include this history: maybe by
> renaming the "js/" subdirectory on the master branch, merging in the
> gsoc-2017 branch to the master branch (assuming this can be done
> without conflicts), and applying the extra commits that have occured
> on the master branch since then.
I've decided not to do this for the time being as several changes to
the directory layout between the different branches could make this
difficult. What I've done is change it from a branch to a tag to make
the branch less conspicuous and indicate that no more commits should
be made.