Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Notify about three way merge in the summary email #3

Open
kvalo opened this issue May 11, 2016 · 0 comments
Open

Notify about three way merge in the summary email #3

kvalo opened this issue May 11, 2016 · 0 comments

Comments

@kvalo
Copy link
Owner

kvalo commented May 11, 2016

In the summary email it would be nice to notify if git had to fall back to 3-way merge, like here:

master@wireless-drivers-next > commit 2
Retrieving patches (1/1) 
9007981 mwifiex: Drop unnecessary include pcieport_if.h
------------------------------------------------------------
1 patches
commit All/commit Individually/aBort? a
Applying: mwifiex: Drop unnecessary include pcieport_if.h
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/marvell/mwifiex/pcie.h
============================================================
1 patches applied:

30cfe9f61c2e mwifiex: Drop unnecessary include pcieport_if.h

Accept/request Changes/Reject/Show mail/Edit mail/aBort? 
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant