|
| From: | Dmitry Gutov |
| Subject: | Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets |
| Date: | Sun, 01 Feb 2015 21:39:17 +0200 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:33.0) Gecko/20100101 Thunderbird/33.0 |
On 02/01/2015 09:29 PM, David Engster wrote:
It's a very easy mistake to make, and I'd rather say it is wrong that Git defaults to fast-forward merges.
Maybe admin/notes/git-workflow should have a section about feature branches, and prescribe 'git merge --no-ff' when merging a long-running feature branch.
However I wouldn't say that the forest of merges if the biggest problem we have. At least a sufficiently smart script can filter out those.
| [Prev in Thread] | Current Thread | [Next in Thread] |