Acked-by:
Acked-by:
Posted Mar 10, 2015 12:29 UTC (Tue) by meuh (guest, #22042)Parent article: The kernel's code of conflict
https://git.kernel.org/cgit/linux/kernel/git/torvalds/lin...
And the merge (for the note from Linus):
https://git.kernel.org/cgit/linux/kernel/git/torvalds/lin...
Posted Mar 10, 2015 16:40 UTC (Tue)
by ebiederm (subscriber, #35028)
[Link] (1 responses)
The historical code of conflict is go to a conference and talk to people in person, thus engaging everyone's empathy.
Posted Mar 10, 2015 22:10 UTC (Tue)
by helsleym (guest, #92730)
[Link]
Acked-by:
Acked-by: