<?xml version="1.0" encoding="utf-8" standalone="yes"?><rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Branching and Merging Strategy on C2 Platform</title><link>https://next.c2platform.org/docs/guidelines/setup/branching/</link><description>Recent content in Branching and Merging Strategy on C2 Platform</description><generator>Hugo</generator><language>en</language><atom:link href="https://next.c2platform.org/docs/guidelines/setup/branching/index.xml" rel="self" type="application/rss+xml"/><item><title>Ansible Vault Changes</title><link>https://next.c2platform.org/docs/guidelines/setup/branching/vault/</link><pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate><guid>https://next.c2platform.org/docs/guidelines/setup/branching/vault/</guid><description>&lt;div class="alert alert-primary" role="alert">


 When modifying 




 
 
 
 
 
 
 
 
 
 
&lt;a class="term-link" href="https://next.c2platform.org/docs/glossary/#ansible-vault" title="Glossary term: Click for definition">Ansible Vault&lt;/a> files, use dedicated vault branches merged directly
to main to avoid merge conflicts in encrypted files, enable immediate production
hotfixes, and maintain clear documentation.

&lt;/div>

&lt;h2 id="problem">Problem&lt;/h2>
&lt;p>




 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
&lt;a class="term-link" href="https://next.c2platform.org/docs/glossary/#ansible-vault" title="Glossary term: Click for definition">Ansible Vault&lt;/a> files in 




 
 
 
 
 
 
 
 
 
 
&lt;a class="term-link" href="https://next.c2platform.org/docs/glossary/#secret_vars" title="Glossary term: Click for definition">secret_vars&lt;/a> are encrypted, making merge
conflicts difficult to resolve as standard Git tools cannot diff or merge them
automatically. This leads to manual decryption, diffing, and merging, which is
error-prone and time-consuming. In a 




 
 
 
 
 
 
 
 
 
 
&lt;a class="term-link" href="https://next.c2platform.org/docs/glossary/#gitops" title="Glossary term: Click for definition">GitOps&lt;/a> workflow, especially during the
transition to 




 
 
 
 
 
 
 
 
 
 
&lt;a class="term-link" href="https://next.c2platform.org/docs/glossary/#iac" title="Glossary term: Click for definition">IaC&lt;/a> in Dutch government organizations, frequent vault changes
across feature branches can cause conflicts, delaying promotions and
complicating hotfixes.&lt;/p></description></item></channel></rss>