Re: [Nix-dev] About merge vs non-merge

2014-09-02 Thread Luca Bruno
> > > I'm not sure what the purpose of this thread is. Is it to incite people > to use the green button? Is it to ask them to manually merge smarter? > > Not lose track of multiple-commit merges, and not lose track of the PR information when manually pushing PRs. ___

Re: [Nix-dev] About merge vs non-merge

2014-09-02 Thread Mateusz Kowalczyk
On 09/02/2014 05:51 PM, Luca Bruno wrote: > Somebody does not like merges because it makes the history "less clean". > However, just today, I encountered a case where the merge was needed for > a revert. > > The good thing about the green merge button is that: > 1) It retains a message about the P

Re: [Nix-dev] About merge vs non-merge

2014-09-02 Thread Vladimír Čunát
On 09/02/2014 08:23 PM, Rok Garbas wrote: so all "merge loving ppl" please keep history clean. github merges are_bad_ practise said by not only me, i guess you can search google for this so i wont spoil you the fun reading on this topic. I don't understand why merges are considered to "dirty" t

Re: [Nix-dev] About merge vs non-merge

2014-09-02 Thread Luca Bruno
If you do that when manually merging that's ok. Give references to the PR, not just push multiple-commits without any track if they were bundled or not, that was my main point. If you don't understand what's happening, there's git log --no-merges. On Tue, Sep 2, 2014 at 8:23 PM, Rok Garbas wrote

Re: [Nix-dev] About merge vs non-merge

2014-09-02 Thread Rok Garbas
Quoting Luca Bruno (2014-09-02 18:51:39) > Somebody does not like merges because it makes the history "less clean". > However, just today, I encountered a case where the merge was needed for > a revert. > > The good thing about the green merge button is that: > 1) It retains a message about the PR

[Nix-dev] About merge vs non-merge

2014-09-02 Thread Luca Bruno
Somebody does not like merges because it makes the history "less clean". However, just today, I encountered a case where the merge was needed for a revert. The good thing about the green merge button is that: 1) It retains a message about the PR. So you have information if you need to do a revert.