The Wiert Corner – irregular stream of stuff

Jeroen W. Pluimers on .NET, C#, Delphi, databases, and personal interests

  • My badges

    Mastodon

  • Twitter Updates

  • My Flickr Stream

    20140508-Delphi-2007--Project-Options--Cannot-Edit-Application-Title-HelpFile-Icon-Theming20140430-Fiddler-Filter-Actions-Button-Run-Filterset-now20140424-VMware-Fusion-6.0.3.-no-reclaimable
    More Photos

  • Pages

  • All categories

  • Enter your email address to subscribe to this blog and receive notifications of new posts by email.

    Join 1,860 other subscribers
«
»

Git: how to resolve merge conflicts | softwarecave

Posted by jpluimers on 2014/08/28

Often the git command-line is easier to than merge a combination of changes, moves and deletions using SourceTree.

If you know how to read the git status output, and to act accordingly.

This tells you how: Git: how to resolve merge conflicts | softwarecave.

–jeroen

This entry was posted on 2014/08/28 at 22:11 and is filed under Development, DVCS - Distributed Version Control, git, Power User, Source Code Management. You can follow any responses to this entry through the RSS 2.0 feed. You can leave a response, or trackback from your own site.

Leave a comment

This site uses Akismet to reduce spam. Learn how your comment data is processed.

«
»