gluon-cli
Version:
Gluon cli: the gitflow and CI tool
233 lines (120 loc) • 6.34 kB
HTML
<html>
<head>
<meta charset="utf-8">
<title>Resolving conflicts with git</title>
<link rel="stylesheet" type="text/css" href="../../css/main.css">
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha256-/SIrNqv8h6QGKDuNoLGA4iret+kyesCkHGzVUUV0shc=" crossorigin="anonymous"></script>
</head>
<body>
<section class="docs">
<aside>
<div class="logoContainer">
<a href="../../index.html">
<img src="../../images/logo.svg" class="logo" />
Gluon
</a>
</div>
<ul class="main_menu">
<li>
<h4>General</h4>
<a href="../../users/get_started.html">How to install</a>
<a href="../../users/get_started010whatis.html">What is gluon?</a>
</li>
<li>
<h4>Tutorials</h4>
<ul>
<li>
<a href="../../users/tutorials/000init.html">Start working with Gluon!</a>
</li>
<li>
<a href="../../users/tutorials/010feature.html">Working with Features</a>
</li>
<li>
<a href="../../users/tutorials/020release.html">The Release process</a>
</li>
<li>
<a href="../../users/tutorials/030hotfix.html">Make a Hotfix</a>
</li>
<li>
<a href="../../users/tutorials/040merger.html">Merging master to develop</a>
</li>
<li>
<a href="../../users/tutorials/050conflicts.html" class="selected">Resolving conflicts with git</a>
</li>
<li>
<a href="../../users/tutorials/060consolidate.html">Consolidate dependencies of master</a>
</li>
</ul>
</li>
<li>
<h4>Guides</h4>
<ul>
<li>
<a href="../../users/guides/001versioning.html">Versions between branches</a>
</li>
<li>
<a href="../../users/guides/002readlogoutput.html">Reading log execution of Gluon</a>
</li>
<li>
<a href="../../users/guides/003componentlifecycle.html">Component lifecycle using Gluon</a>
</li>
</ul>
</li>
<li>
<h4>API</h4>
<h5>FLOWS</h5>
<ul>
</ul>
<h5>STEPS</h5>
<ul>
</ul>
</li>
</ul>
</aside>
<article>
<h1 id="resolve-conflicts-using-git-command-line">Resolve conflicts using git command line</h1>
<p>Use you favorite tools for git conflict resolution, here is a simple example of using conflict resolution using git by command line.</p>
<p>Suppose we get a merge conflict.</p>
<pre><code class="lang-bash">[13:01:19] sipper Flow error (execution stopped) ERROR {cmd: 'git',
Args: ['merge', 'master'],
Options: undefined,
Status: 'ERROR',
Error: undefined,
Output: 'Auto-merging package.json \ nCONFLICT (content): Merge conflict in package.json \ nAutomatic merge failed; Fix conflicts and then commit the result. \ N '}
[13:01:19] Total time - 02 s 025 ms
</code></pre>
<p>In the package.json file you will see these annotations:</p>
<pre><code class="lang-javascript">{
"name": "pisco-plugin-npm",
<<<<<<< HEAD
"version": "0.1.6-aam.0",
=======
"version": "0.1.5",
>>>>>>> master
....
</code></pre>
<p>Edit the file and resolve the conflict.</p>
<pre><code class="lang-javascript">{
"name": "pisco-plugin-npm",
"version": "0.1.6-aam.0",
....
</code></pre>
<p>Commit the file</p>
<pre><code class="lang-bash">git add.
git commit -m "resolve ()"
</code></pre>
<p>This conflict will be resolved. Now is possible to go on with any Gitflow task!</p>
</article>
</section>
<script type="text/javascript" src="../../js/highlight.pack.js"></script>
<script>
hljs.initHighlightingOnLoad();
$(function(){
$('.toggle_section').on('click', function(ev) {
$(ev.currentTarget).parent('li').toggleClass('open');
});
});
</script>
</body>
</html>