> git checkout master
> git merge flake-odf-gluepoints...
> git pull --rebase
> git push
>
> Ciao Jan
Thanks Jan.
I also did "git merge --log" with the branch with TOC feature.
That --log was suggested by boud, it shows more
verbose commit message.
For the nice commit message you need to
commit
On Monday 31 January 2011, ja...@gmx.net wrote:
> But there were problems with the anongit out of sync with git.kde.org.
When this happen, wait a few minutes and try pushing again. There is about one
minute synchronization delay, between anongit and git.kde.org. So if you are
unlucky, someone mig
On Monday 31 January 2011 14:27:50 Lukast dev wrote:
> Hello,
>
> I would like to have your opinion about the preferable and consistent way
> of merging of the code from the features branches we have into master.
>
> There are more ways:
> 1. git cherry-picking
> a) cherrypick single commits
> b)
On Monday 31 January 2011, Dmitry Kazakov wrote:
> On Mon, Jan 31, 2011 at 4:27 PM, Lukast dev <> wrote:
> > boud:
> ...
>
> > o but then the development branch should never be deleted, otherwise
> > we have one big commit that nobody can every bisect anymore and never
> > figure out the history o
On Mon, Jan 31, 2011 at 4:27 PM, Lukast dev <> wrote:
>
> boud:
>
...
> o but then the development branch should never be deleted, otherwise
> we have one big commit that nobody can every bisect anymore and never
> figure out the history of
>
I'm not sure the latest statement is true. If the bra
