[ofiwg] Pull request 2501: Ofi bgq provider merge before sc16

[Jeff Squyres (jsquyres)]

On Nov 9, 2016, at 1:11 PM, Coffman, Paul K. <pcoffman at anl.gov> wrote:
> 
> Just wondering if there is any chance my pull request can be merged yet this week?  

Sorry -- been a bit busy with cramming to get ready for SC next week.  :-\

> Status seems to be all checks have passed so just wondering what further reviews are required – apparently there is just 1 minor merge conflict.  Thanks.

It would be great if you could fix that conflict before getting the review (because then it would just need to be reviewed again).

You can just rebase your local copy with the HEAD of master, and fix the conflict in the process.  Then you can force-push back up to your branch on github (this is just about the *only* socially-acceptable case of force pushing!).  The PR will automatically update with the new state of the branch.

-- 
Jeff Squyres
jsquyres at cisco.com
For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/