× {{alert.msg}} Never ask again
Get notified about new tutorials RECEIVE NEW TUTORIALS

Deal with Git Conflicts ASAP

David Brumbaugh
Aug 31, 2016
<p>Git merge conflicts are inevitable.  Resolving them is often a time intenstive process.  It's better to find conflicts early and resolve them sooner rather than later.</p> <p>1. Regularly sync your local with master from remote<br> 2. Check out your working branch<br> 3. Do: git merge master <br> 4. Resolve conflicts<br> 5. Commit</p> <p>This keeps the manual conflict resolution process to one or two conflcits at a time rather than a ton of them at the end.</p> <p>Bonus tip: After you merge your working branch to master, always do one last review before you push it back to the origin.</p>
comments powered by Disqus