<br>Hi Folks, <br>
<br>Please, next time you update you repository and before you push any 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 <font style="font-family: courier new,monospace;" size="2">git config -l <span style="font-family: arial,helvetica,sans-serif;">should help you to identify what</span></font><span style="font-family: arial,helvetica,sans-serif;">'s the remote corresponding to the offical CTK.</span><br>
<br>For example:<br><br>$ git config -l<br><br><font size="1"><span style="font-family: courier new,monospace;">core.repositoryformatversion=0</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">core.filemode=true</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">core.bare=false</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">core.logallrefupdates=true</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">remote.<b>origin</b>.url=<b>git://<a href="http://github.com/commontk/CTK.git">github.com/commontk/CTK.git</a></b></span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">branch.master.remote=origin</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">branch.master.merge=refs/heads/master</span></font><br>
<br>In that case, <b>origin</b> identify the remote.<br><br><br><b>Why ? </b><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 in order to avoid any problem ... <br>
<br>Any question, let me know<br><br>Thks<br>Jc<br><br><br clear="all"><br>-- <br>Phone: 1-518-836-2174<br>Ext: 304<br>