Merge Initial Resolution with airSlate SignNow

Merge initial resolution

so we have a merger quest here and we're trying to merge branch a into B and there's some conflicts so what we're gonna do is we're gonna resolve these conflicts and the thing about resolving conflicts is that the way that it works is before we merge our source branch a into destination branch B we have to pick up those conflicts in our source branch right pick up the resolution of those conflicts so we get a clean merge and so you can see in this it's saying we're resolving conflicts on the source branch and then it has this default commit commit message merge branch B into a so it's a little bit confusing with that default commit message because it looks like what's happening is the opposite of what we intend but when whenever we have merge conflicts what happens is again we have to pull the changes from the destination branch they conflict into our source branch so we get a nice clean merge and so if we're gonna use even if we're gonna use ours then that's no problem if we use theirs there's no problem we're just still anything that conflicts we're gonna have to note in our source branch before we can merge cleanly into our destination branch so I commit to the source branch now we're gonna get that merge branch B and a which looks a little bit confusing but what we can see is that's in our commit history now so there's two commits the one where I changed a line and then the one where I resolved those commits so now if I merge this let's take a look at what happens so again we merge sort we merge our source branches a and our destination branches B so let's take a look at the commits so on a you can see we introduced a conflict and then merge French B into a that's where we resolve the conflict on branch B we also get a commit because we committed we can fix the conflicts in our source branch before merging it into our destination branch so it looks like we merged B into a and then a and to be I think that I it would be more helpful in our screen if we said something like fixed conflicts from be in a but that's what's happening it the intended result works out but it does have this confusing message by default