I am just moving from SVN to GIT. I have gone through the posts and comments but not finding effective solution.
I have a below questions:
How to checked out or Lock the files so, other developer is aware that file is unavailable and checked out by this user ?
If one user has updated the same file where other user is working on and both have push the changes to master repository. Now, how it resolve the conflicts or merge.
How conflict or merge works.
Do we have a option to manage conflicts in tortoiseGIT or internally manage by GIT repositories push command. ?
Please let me know the above questions resolution.
Thank You.