Correct - this is one time operation required only for CTK developer. (dashboard, slicer superbuild etc .. are not concerned)<br><br>The linear history workflow as described on <a href="http://www.commontk.org/index.php/Build_Instructions#Simple_Git" target="_blank">http://www.commontk.org/index.php/Build_Instructions#Simple_Git</a>  still apply.<br>

<br>Nevertheless, if you plan to work on a new feature (more than on classes, a CTK library, etc .. ) you may want to move toward a branchy workflow. I started a page (work in progress): <a href="http://www.commontk.org/index.php/Contributing_to_CTK">http://www.commontk.org/index.php/Contributing_to_CTK</a> that will describe how to follow a branchy workflow <br>

<br>Thks<br>Jc<br><br><div class="gmail_quote">On Mon, Aug 23, 2010 at 6:17 PM, Steve Pieper <span dir="ltr"><<a href="mailto:pieper@bwh.harvard.edu">pieper@bwh.harvard.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">

Hi Jc -<br>
<br>
Is this a one-time operation to do the hard reset?<br>
<br>
That is, for now we are still following the 'simple git' model describe here, correct?<br>
<br>
<a href="http://www.commontk.org/index.php/Build_Instructions#Simple_Git" target="_blank">http://www.commontk.org/index.php/Build_Instructions#Simple_Git</a><br>
<br>
-Steve<div class="im"><br>
<br>
On Aug/23/10 5:48 PM, Jean-Christophe Fillion-Robin wrote:<br>
</div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"><div class="im">
<br>
Hi Folks,<br>
<br>
Please, next time you update you repository and before you push any<br>
changes, make sure you do the following:<br>
<br>
  git fetch upstream<br>
  git reset --hard refs/remotes/upstream/master<br>
  git pull upstream master<br>
<br>
where upstream is the remote identifying the official CTK repository.<br>
<br>
The command git config -l should help you to identify what's the remote<br>
corresponding to the offical CTK.<br>
<br>
For example:<br>
<br>
$ git config -l<br>
<br>
core.repositoryformatversion=0<br>
core.filemode=true<br>
core.bare=false<br>
core.logallrefupdates=true<br>
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*<br>
remote.*origin*.url=*git://<a href="http://github.com/commontk/CTK.git" target="_blank">github.com/commontk/CTK.git</a><br></div>
<<a href="http://github.com/commontk/CTK.git" target="_blank">http://github.com/commontk/CTK.git</a>>*<div class="im"><br>
branch.master.remote=origin<br>
branch.master.merge=refs/heads/master<br>
<br>
In that case, *origin* identify the remote.<br>
<br>
<br>
*Why ? *<br>
<br>
To fix the history, the last few commits have been re-pushed.<br>
<br>
In the future, we will have some hooks that you will be able to install<br>
in order to avoid any problem ...<br>
<br>
Any question, let me know<br>
<br>
Thks<br>
Jc<br>
<br>
<br>
<br>
--<br>
Phone: 1-518-836-2174<br>
Ext: 304<br>
<br>
<br>
<br></div>
_______________________________________________<br>
Ctk-developers mailing list<br>
<a href="mailto:Ctk-developers@commontk.org" target="_blank">Ctk-developers@commontk.org</a><br>
<a href="http://public.kitware.com/cgi-bin/mailman/listinfo/ctk-developers" target="_blank">http://public.kitware.com/cgi-bin/mailman/listinfo/ctk-developers</a><br>
</blockquote>
</blockquote></div><br><br clear="all"><br>-- <br>Phone: 1-518-836-2174<br>Ext: 304<br>