1 min readSep 13, 2019
Sahan Dilshan Yes, if the files that you have changed are edited in the existing branch as well, there will be merge conflicts and you will have to manually resolve those conflicts and commit the changes in updated files. I haven’t talked about that to keep this post simple, will explain it on the next post 😃