Having comprehensive power over your documents at any time is crucial to alleviate your day-to-day tasks and improve your efficiency. Achieve any goal with DocHub tools for papers management and practical PDF file editing. Gain access, modify and save and integrate your workflows along with other protected cloud storage.
DocHub offers you lossless editing, the opportunity to use any formatting, and securely eSign documents without searching for a third-party eSignature software. Maximum benefit from the document managing solutions in one place. Consider all DocHub capabilities right now with your free of charge account.
hey guys so today Im going to show you how to resolve merging conflicts so as you can see Im gonna get LePage I have two files that have some conflicts six conflicts in total okay so let me go to source stream and here Im in that branch already so in order for me to trigger the same conflict I need to actually pull pool from master branch so let me do that real quick so Im pulling from master now and once Ive done that we will see that its a little bit slow so okay here we go so as you can see here we have two files and let me start with this one so Im using SourceTree but you can really use any other tool and the reason I like the source tree in particular it has this external merge tool option and since I already have v4 merge tool installed for resolving the conflicts Im gonna just click Launch external merge tool in case you dont have that set up you can watch another video from our channel where I explain how to those tools and set them up so they hooked up toget