This week I merged work from soc-2013-viewport_fx with soc-2014-viewport.<div><br></div><div>It seems like dealing with merge conflicts is eating more and more time, so I'm determining a strategy to reduce them. I'm identifying as much as I can that can be merged into master on a near term schedule and will be submitting it for review. </div>
<div><br></div><div>I've also been putting off fixing some unneeded headaches I made for myself (I moved a couple of things around that in retrospect should have been submitted to master right away)</div><div><br></div>
<div>Next week I'll be reaching out to the community to find people to help with testing. I'll also be submitting any patches that I think can be considered at this early point.</div><div><br></div>One question that comes to mind is since the move to git have any of the other tools also been changed? For example, the patch tracker and code review tool? I'm assuming these are the best way to submit and keep track of work that I think is ready.<span></span>