<body><div id="__MailbirdStyleContent" style="font-size: 10pt;font-family: Arial;color: #000000;text-align: left" dir="ltr">
<div><span style="white-space: pre-wrap;font-size: 10pt">Hi all --</span></div><div><span style="white-space: pre-wrap;font-size: 10pt"><br></span></div><div><span style="white-space: pre-wrap;font-size: 10pt">Sure. Then, why is our CI able to update from </span><span style="font-size: 10pt;white-space: pre-wrap">19432 (~April 2020) to </span><span style="font-size: 10pt">20916 (today) without merge conflicts in postscripts so far? I suspect that Christoph might have had an uncommited changed postscript in his local image?</span></div><div><span style="font-size: 10pt"><br></span></div><div><span style="font-size: 10pt">Best,</span></div><div><span style="font-size: 10pt">Marcel</span></div><div class="mb_sig"></div><blockquote class='history_container' type='cite' style='border-left-style:solid;border-width:1px; margin-top:20px; margin-left:0px;padding-left:10px;'>
<p style='color: #AAAAAA; margin-top: 10px;'>Am 30.12.2021 10:06:37 schrieb Levente Uzonyi <leves@caesar.elte.hu>:</p><div style='font-family:Arial,Helvetica,sans-serif'>Hi Marcel,<br><br>On Wed, 29 Dec 2021, Marcel Taeumel wrote:<br><br>> I hope there wouldn't be a conflict if the update map would have been updated for the changed postscript? In that case: Thanks for this tip! I will try to either only append stuff to the postscript or update the update map if<br>> I also remove stuff. Well, can the merger actually merge append-only things?<br><br>Appending stuff to the scripts is bad practice because the whole block <br>will be evaluated every time. And most of the time those scripts are <br>intended to be run only once.<br><br>However, there should always be a new update map when a script is changed.<br><br><br>Levente<br><br></div></blockquote>
</div></body>