A no-fluff, step-by-step guide for software engineers dealing with massive Git merge conflicts during migrations or long-lived branches. Includes real anecdotes and ASCII diagrams.
Welcome to Lorbic! By accessing and using this website, you agree to comply with and be bound by the following terms and conditions of use. If you do not agree to these terms, please do not use this website.
We do not collect, use or sell your information. You may share your email address and name by contacting the author and while commenting on a blog post. Your email address and name will only be used for replying to you or idetification on the comment system. Other than that we do not use it.
In future there might be newsletters and account registration features. Then we will update this document and add new terms and privacy policies.
The content on this blog is provided for general information purposes only. The author and the website make no representations or warranties of any kind, express or implied, about the completeness, accuracy, reliability, suitability, or availability of the information, products, services, or related graphics contained on the website for any purpose.
The copyright for the content on this website is owned by the author and Lorbic. All rights reserved.
Lorbic reserves the right to change these terms of service at any time. Changes will be effective immediately upon posting to the website. Your continued use of the website constitutes acceptance of the modified terms.
If you have any questions or concerns regarding these terms, please contact us at [email protected].
Thank you for visiting Lorbic!
