<div dir="ltr"><div>SUMMARY</div><div>---------------------------------------------</div><div>Topics merged into master: </div><div>        fix-Use-raw-strings-to-prevent-escaping</div><div>        fix_transpose_table</div>
<div>        make_tracers_a_separate_output</div><div>        pvweb-add-widget-support</div><div>        pvweb-webgl-center-of-rotation</div><div><br></div><div>---------------------------------------------<br></div><div>
<br></div><div>Hi All,</div><div><br></div><div>I had to reset next yesterday to get back to a clean dashboard which finally allowed me to do a gatekeeper review today.</div><div>So if you merged your branch yesterday into next, your branch has been reverted. And if that work still make sense, you will need to re-submit it. And to do that you should rebase it on top of master and merge it again. At the bottom of that mail, I've added some git help.</div>
<div><br></div><div>Thanks and sorry for the inconvenient,</div><div><br></div><div>Seb</div><div><br></div><div><div style="font-family:arial,sans-serif;font-size:13px">---------------------------------------------</div>
<div style="font-family:arial,sans-serif;font-size:13px">            Git cheat sheet</div><div style="font-family:arial,sans-serif;font-size:13px">---------------------------------------------</div><div style="font-family:arial,sans-serif;font-size:13px">
<br></div><div style="font-family:arial,sans-serif;font-size:13px"># Merge a branch from stage to next:</div><div style="font-family:arial,sans-serif;font-size:13px"># -------</div><div style="font-family:arial,sans-serif;font-size:13px">
$ <span class="" style="background-color:rgb(255,255,204)">ssh</span> <a href="mailto:git@paraview.org" target="_blank">git@paraview.org</a> stage ParaView merge YOUR_STAGE_BRANCH_NAME</div><div style="font-family:arial,sans-serif;font-size:13px">
<br></div><div style="font-family:arial,sans-serif;font-size:13px"># Delete your branch from stage:</div><div style="font-family:arial,sans-serif;font-size:13px"># -------</div><div style="font-family:arial,sans-serif;font-size:13px">
$ git push stage :YOUR_STAGE_BRANCH_NAME</div><div style="font-family:arial,sans-serif;font-size:13px"><br></div><div style="font-family:arial,sans-serif;font-size:13px"># To rebase your work on top of master</div><div style="font-family:arial,sans-serif;font-size:13px">
# -------</div><div style="font-family:arial,sans-serif;font-size:13px">$ git fetch origin</div><div style="font-family:arial,sans-serif;font-size:13px">$ git checkout -b YOUR_STAGE_BRANCH_NAME stage/YOUR_STAGE_BRANCH_NAME</div>
<div style="font-family:arial,sans-serif;font-size:13px">$ git rebase origin/master</div><div style="font-family:arial,sans-serif;font-size:13px">$ git push stage :YOUR_STAGE_BRANCH_NAME</div><div style="font-family:arial,sans-serif;font-size:13px">
$ git stage-push</div><div style="font-family:arial,sans-serif;font-size:13px">$ git stage-merge</div></div></div>