Merge Mark Choice with airSlate SignNow

Merge mark resolution

hi there it's Peter here again the guy who hates Tomatoes but loves front-end development in today's video you will learn how to resolve simple merge conflicts in kit but before we do that don't forget to smash to like subscribe to the channel so you don't miss all the other get tutorials to be able to merge two branches together we will firstly create two branches we'll make two changes in each of them and then we see where the conflicts appear and how to resolve it okay so you I want you to be clear of what we're working with so for now we have a git branch only master and well we will create two branches and we'll make two changes in each I'll speed up through this process because it should be quite straightforward by now we are adding two names to his branch so the content txt gets two names in his branch and will save it as his changes and in my branch I will add two colors and save it as comet with the message of my colors or my changes now we can try to merge his branch into my branch let's say I'm working on a feature and your colleague is working on another feature and you want to bring his feature into yours and continue working in your branch mackay so we will try to merge his branch into my branch and to do that we simply need to check out the branch you want to merge into so we are currently on a my branch which is correct and we want to merge his branch ok so remember you need to be checked out on the branch you want to merge into and then you merge the branch of the changes you want to bring in ok so if we do that then you will definitely get a conflict because we both we've edited the lines 4 and 5 of the content txt and then Gator doesn't know how to automatically resolve this conflict because we both touch the same file in the same lines if we touch different lines then it could easily merge it automatically but because we've edited the same file same line we gonna get conflict and here it is the the famous conflict that everyone hates and in this tutorial you will learn how to resolve it without any headaches so we are being notified by gate that the content txt is the issue and he couldn't automatically resolve it and we need to resolve the conflicts manually and commit the result okay so if you freak out at this moment and decide to quit the merge call ambulance or policemen or firefighters whatever your approaches then you can still revert back to merge so abort the merge and the command is get a merge abort okay that will repair the merge cancel everything and you are back where you were before merging these...