Re: [PATCH 0/3] Make git more user-friendly during a merge conflict

2014-03-19 Thread Junio C Hamano
Andrew Wong writes: > On Mon, Mar 17, 2014 at 7:04 PM, Junio C Hamano wrote: >> Has this series been tested with existing test suite? ... > I tested it during RFC, but missed it when I sent it as patch. > ... > I'll fix the problem. Sorry about that. Thanks. Will hold onto the topic branch les

Re: [PATCH 0/3] Make git more user-friendly during a merge conflict

2014-03-17 Thread Andrew Wong
On Mon, Mar 17, 2014 at 7:04 PM, Junio C Hamano wrote: > Has this series been tested with existing test suite? I tentatively > queued it to 'pu' but then had to revert because many tests started > failing, causing me to redo the today's integration cycle for 'pu' > once again. I tested it during

Re: [PATCH 0/3] Make git more user-friendly during a merge conflict

2014-03-17 Thread Junio C Hamano
Andrew Wong writes: > 2/3: I've added advice.mergeHints to silent the messages that suggests "git > merge--abort". > > 3/3: I've added a warning message when users used "git reset" during a merge. > This warning will be printed if the user is in the middle of a merge. In > future > releases, we'

[PATCH 0/3] Make git more user-friendly during a merge conflict

2014-03-13 Thread Andrew Wong
2/3: I've added advice.mergeHints to silent the messages that suggests "git merge--abort". 3/3: I've added a warning message when users used "git reset" during a merge. This warning will be printed if the user is in the middle of a merge. In future releases, we'll change this into an error to prev