<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META content="text/html; charset=gb2312" http-equiv=Content-Type>
<META name=GENERATOR content="MSHTML 8.00.7600.16722">
<STYLE>@font-face {
font-family: 宋体;
}
@font-face {
font-family: Verdana;
}
@font-face {
font-family: @宋体;
}
@page Section1 {size: 595.3pt 841.9pt; margin: 72.0pt 90.0pt 72.0pt 90.0pt; layout-grid: 15.6pt; }
P.MsoNormal {
TEXT-JUSTIFY: inter-ideograph; TEXT-ALIGN: justify; MARGIN: 0cm 0cm 0pt; FONT-FAMILY: "Times New Roman"; FONT-SIZE: 10.5pt
}
LI.MsoNormal {
TEXT-JUSTIFY: inter-ideograph; TEXT-ALIGN: justify; MARGIN: 0cm 0cm 0pt; FONT-FAMILY: "Times New Roman"; FONT-SIZE: 10.5pt
}
DIV.MsoNormal {
TEXT-JUSTIFY: inter-ideograph; TEXT-ALIGN: justify; MARGIN: 0cm 0cm 0pt; FONT-FAMILY: "Times New Roman"; FONT-SIZE: 10.5pt
}
A:link {
COLOR: blue; TEXT-DECORATION: underline
}
SPAN.MsoHyperlink {
COLOR: blue; TEXT-DECORATION: underline
}
A:visited {
COLOR: purple; TEXT-DECORATION: underline
}
SPAN.MsoHyperlinkFollowed {
COLOR: purple; TEXT-DECORATION: underline
}
SPAN.EmailStyle17 {
FONT-STYLE: normal; FONT-FAMILY: Verdana; COLOR: windowtext; FONT-WEIGHT: normal; TEXT-DECORATION: none; mso-style-type: personal-compose
}
DIV.Section1 {
page: Section1
}
UNKNOWN {
FONT-SIZE: 10pt
}
BLOCKQUOTE {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px; MARGIN-LEFT: 2em
}
OL {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px
}
UL {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px
}
</STYLE>
</HEAD>
<BODY style="MARGIN: 10px; FONT-FAMILY: verdana; FONT-SIZE: 10pt">
<DIV><FONT color=#000080 size=2 face=Verdana></FONT> </DIV>
<DIV><FONT color=#000080>Hi Jeff,</FONT></DIV>
<DIV><FONT color=#000080></FONT> </DIV>
<DIV><FONT color=#000080>As my lastest understanding (learning from google just
now <IMG src="cid:__0@Foxmail.net">), i can also create a branch at local, on
this branch i change my codes, and after a few days i can merge the lastest
master(git from remote) to my branches... so, i can periodically (few days or
months) do like this to keep my changes code and update latest
master to my codes (when i need)... is my understanding correct?</FONT></DIV>
<DIV><FONT color=#000080></FONT> </DIV>
<DIV>
<DIV><FONT color=#000080>Thanks!</FONT></DIV></DIV>
<DIV><FONT color=#000080></FONT> </DIV>
<DIV><FONT color=#000080>Regards,</FONT></DIV>
<DIV><FONT color=#000080>Charles</FONT></DIV>
<DIV><FONT color=#000080 size=2 face=Verdana></FONT> </DIV>
<DIV><FONT color=#c0c0c0 size=2 face=Verdana>2011-04-01 </FONT></DIV><FONT
color=#000080 size=2 face=Verdana>
<HR style="WIDTH: 100px" align=left color=#b5c4df SIZE=1>
</FONT>
<DIV><FONT color=#c0c0c0 size=2 face=Verdana><SPAN>Charles</SPAN> </FONT></DIV>
<HR color=#b5c4df SIZE=1>
<DIV><FONT size=2 face=Verdana><STRONG>发件人：</STRONG> Jeff Lenk </FONT></DIV>
<DIV><FONT size=2 face=Verdana><STRONG>发送时间：</STRONG> 2011-04-01 11:09:36
</FONT></DIV>
<DIV><FONT size=2 face=Verdana><STRONG>收件人：</STRONG> freeswitch-users
</FONT></DIV>
<DIV><FONT size=2 face=Verdana><STRONG>抄送：</STRONG> </FONT></DIV>
<DIV><FONT size=2 face=Verdana><STRONG>主题：</STRONG> Re: [Freeswitch-users] How
to realize -GIT pull latest version toalocal copy and work with prevoius changes
</FONT></DIV>
<DIV><FONT size=2 face=Verdana></FONT> </DIV>
<DIV><FONT size=2 face=Verdana>
<DIV>no problem!</DIV>
<DIV></DIV>
<DIV>The stash save will move your local changes aside(to a holding place so to</DIV>
<DIV>speak) so you can pull the changes from the remote repo and then the stash</DIV>
<DIV>pop merges your changes back into the local directory. all this is done on</DIV>
<DIV>your local directory and repository.</DIV>
<DIV></DIV>
<DIV>--</DIV>
<DIV>View this message in context: http://freeswitch-users.2379917.n2.nabble.com/How-to-realize-GIT-pull-latest-version-to-a-local-copy-and-work-with-prevoius-changes-tp6229486p6229566.html</DIV>
<DIV>Sent from the freeswitch-users mailing list archive at Nabble.com.</DIV>
<DIV></DIV>
<DIV>_______________________________________________</DIV>
<DIV>FreeSWITCH-users mailing list</DIV>
<DIV>FreeSWITCH-users@lists.freeswitch.org</DIV>
<DIV>http://lists.freeswitch.org/mailman/listinfo/freeswitch-users</DIV>
<DIV>UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users</DIV>
<DIV>http://www.freeswitch.org</DIV></FONT></DIV></BODY></HTML>