Messages in this thread | | | From | Kalle Valo <> | Subject | Re: [GIT] Networking | Date | Thu, 17 Jul 2014 05:18:04 +0300 |
| |
"John W. Linville" <linville@tuxdriver.com> writes:
> On Tue, Jul 15, 2014 at 11:46:14AM -0700, David Miller wrote: >> From: Linus Torvalds <torvalds@linux-foundation.org> >> Date: Tue, 15 Jul 2014 08:52:33 -0700 >> >> > And if David actually asks for these, my apologies.. >> >> I didn't ask for these :-) > > Just trying to be helpful, for those times when there are non-trivial > merge conflicts. I can stop.
Just out of curiosity, what is the best way to send a proposal how to fix a merge conflict? For example, if I send a pull request to John which I know will issue a conflict it would be nice to include instructions (or some sort of patch) how I think it should be resolved.
-- Kalle Valo
| |