Merging and conflict resolving are all part of a process of bringing what in effect
is branch resolution. Two files in conflict are two branches and the resolution
is done by merging a few lines or replacing a whole file. Binary files like Labview
vi's are generally done by replacing whole files. But, that does not have to be the
case.
In SVN, merging is done on the remote repository, but not in GIT.
In GIT all merging, etc. is done in the LOCAL repository. Until you have this concept
firmly in mind you will have a difficult time with merging and conflict resolution.
Once you have decided that you want to completely replace a file here is the process.
Using the Git Extensions: click on the Browser. Choose the revision group that you
wish to use. Open the File tab and select the file that you want to use to replace
with.
Right click on the file you have selected and then select: "Reset to this revison".
Now do a commit and you are ready to PUSH your results to the remote.
Notice that all the work is done on the LOCAL repository, not the remote.
There is a video available GitExtMerge.mp4(27MB), it is stored at:
http://tinyurl.com/aexst82
