Version Control with Subversion - Login

Basic Usage$ svn updateU INSTALLG READMEConflict discovered in 'bar.c'.Select: (p) postpone, (df) diff-full, (e) edit,(h) help for more options:The U and G codes are no cause for concern; those files cleanly absorbed changes fromthe repository. The files marked with U contained no local changes but were Updated withchanges from the repository. The G stands for merGed, which means that the file had localchanges to begin with, but the changes coming from the repository didn't overlap with thelocal changes.But the next two lines are part of a feature (new in Subversion 1.5) called interactive conflictresolution. This means that the changes from the server overlapped with your own,and you have the opportunity to resolve this conflict. The most commonly used options aredisplayed, but you can see all of the options by typing h:…(p) postpone - mark the conflict to be resolved later(df) diff-full - show all changes made to merged file(e) edit - change merged file in an editor(r) resolved - accept merged version of file(mf) mine-full - accept my version of entire file (ignore their changes)(tf) theirs-full - accept their version of entire file (lose my changes)(l) launch - launch external tool to resolve conflict(h) help - show this listLet's briefly review each of these options before we go into detail on what each optionmeans.(p)ostponeLeave the file in a conflicted state for you to resolve after your update is complete.(d)iffDisplay the differences between the base revision and the conflicted file itself in unifieddiff format.(e)ditOpen the file in conflict with your favorite editor, as set in the environment variable ED-ITOR.(r)esolvedAfter editing a file, tell svn that you've resolved the conflicts in the file and that it shouldaccept the current contents—basically that you've “resolved” the conflict.(m)ine-(f)ullDiscard the newly received changes from the server and use only your local changesfor the file under review.(t)heirs-(f)ullDiscard your local changes to the file under review and use only the newly receivedchanges from the server.(l)aunchLaunch an external program to perform the conflict resolution. This requires a bit ofpreparation beforehand.(h)elp27