[asdf-devel] Git merge practice

[Nikodemus Siivola]

Please, when merging branches that will end up in the repo, merge INTO
master before pushing, as opposed to merging master to feature branch.

Example:

commit 4158a412c3ed75c027a47996b52057e812e8b5ed
Merge: 50e98da... 9b5eaf9...
Author: Francois-Rene Rideau <fare at tunes.org>
Date:   Fri Mar 12 10:51:42 2010 -0500

    Merge branch 'master' of http://common-lisp.net/project/asdf/asdf

    Conflicts:
        README.asdf-output-translations

This is would be more informative if it had instead been

   Merge branch 'some-feature' of http://common-lisp.net/project/asdf/asdf

</end of sermon>

Cheers,

 -- Nikodemus