Merge Initial Acceptance with airSlate SignNow

Merge required field resolution

resolving March conflict is one of the biggest issue when multiple peoples are working on the same project and sometimes it becomes a nightmare in our previous tutorial we have seen how to resolve merge conflict using IntelliJ and in this tutorial we will do the same that is resolved merge conflict but by using Visual Studio code so we have cloned the project using git bash and opened the project in Visual Studio code this is JavaScript angular project inside SRC app dot component HTML we will add comment in the last line similarly we will add comments in app dot component dot CSS file let's say the files are changed by person a1 and same goes for HTML file too copy and paste and on component.ts we will add a function hello which logs hello world and these changes are made by same person a 1 we can open terminal from here or using ctrl + tilde now let's mock the change made by other person so we will directly go and update in git repository under SRC app folder app component dot TS we will add a function calculate which takes two parameter x and y and prints the summation of x and y let's commit the changes and then we'll update the CSS file too and add a comment changes made by person b2 and commit the changes person b2 has made changes in two files whereas person a1 has made changes in three files so in Visual Studio code we have saved the changes made in all three files let's run git add all then get commit - M the commit message that is added hello world let's push the change from local repository to remote master branch using git push user ID password we can see that it got rejected and need to pull the remote changes before pushing let's run git pull and we can see the merge conflict occurred so from integrated get tool bar we can see which files have March conflict we have both CSS and TS file here we can compare side by side by clicking compare changes though this will not make any change in the file we can keep both the changes or accept only current change let's undo or change made by person B 2 which is the incoming change similarly for app component ts we will keep both the changes that is function hello world of person a 1 and calculate returned by person B 2 let's save all the files then get add git commit with message fixed merge conflict then get push user ID password and we can see it is successful let's verify it so we can see both the files are merged and the third file changes are not here because those are March to master in previous commit that's all for this tutorial don't forget to hit the like button share and subscribe to code space for any queries right...