lkml.org 
[lkml]   [2015]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] tracing: Updates for 4.4
On Fri, 6 Nov 2015 17:52:06 -0500
Steven Rostedt <rostedt@goodmis.org> wrote:

> I'll have to add something to my scripts that pulls in any merge
> breakage, such that when I run the scripts to generate the pull
> request, it adds them in automatically. Because obviously, the manual
> approach isn't working for me.

I updated my scripts such that if I add a 'notes' file in the repo that
I'm pushing, it will include that into the pull request. Now if there's
a conflict like this again, I can add a comment about it in the notes
file and it will be included in my next pull request.

I just need to remember to delete it after I'm done ;-)

-- Steve


\
 
 \ /
  Last update: 2015-11-07 00:21    [W:1.996 / U:0.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site