2016-01-13 15:44 GMT+01:00 Mariano Martinez Peck <marianopeck@gmail.com>:


On Wed, Jan 13, 2016 at 11:33 AM, Thierry Goubier <thierry.goubier@gmail.com> wrote:


2016-01-13 14:32 GMT+01:00 Mariano Martinez Peck <marianopeck@gmail.com>:

On Wed, Jan 13, 2016 at 10:00 AM, Thierry Goubier <thierry.goubier@gmail.com> wrote:


2016-01-13 13:56 GMT+01:00 Mariano Martinez Peck <marianopeck@gmail.com>:


On Wed, Jan 13, 2016 at 9:27 AM, Thierry Goubier <thierry.goubier@gmail.com> wrote:


2016-01-13 13:12 GMT+01:00 Mariano Martinez Peck <marianopeck@gmail.com>:
Hi guys,

I wanted to know how you manage this situation.��
I had my already existing project in shub repo. Last version was��OSSubprocess-MarianoMartinezPeck.43. I then created a github repo, cloned it, and then with gitfiletree I commit for the first time.��

The problem is that the commit I did with GitFileTree received this MC version:��OSSubprocess-MarianoMartinezPeck.1. Normally I would not care. But in this case I do care because every in a while I would like to move/publish some versions from github to shub. And OSSubprocess-MarianoMartinezPeck.1 has 2 problems:

1) It has an older version number but newer contents
��
2) It's number is not unique. So if I copy versions created from github to shub, they would override those versiones created in shub (like the very old��OSSubprocess-MarianoMartinezPeck.1 from shub) ??��

How do you normally solve this?

The best is to move all the sthub versions on git, like that, gitfiletree will number newer versions higher and this will work.


OK, I got it. So you mean to use a Gofer pull/push operation to move all versions from shub to github, right?

Yes!
\

OK, I did that. Problem is I had screwed up the first version. Because now in gitfiletree repo, the OSSubprocess-MarianoMartinezPeck.1�� is the "new one" and not the old from shub. I suspect this could bring problems for history changes, etc...
��
Is there a way I can revert and copy the original OSSubprocess-MarianoMartinezPeck.1�� from shub and override the OSSubprocess-MarianoMartinezPeck.1�� from gitfiletree?

Yes. You can reset in git to a previous commit, I think it is with git --reset .

But this is problematic if it was pushed on github.
��

Or...at least a way to remove everything and start fresh with the fecth/push???

Yes, but, again, problematic if it was pushed to github.

Thierry

It was pushed to github :(


:( But deleting on github, resetting on your own repo, recreating on github and pushing shouldn't take you very long.
��

Let me ask... do you think my assumption is correct that it could bother me when watching the history via MC browser, or a merge or .. any kind of MC operation that would be screw up because of this? ����
If this is not the case, then...ok, I can live with that mistake.

No, it shouldn't bother you neither make any operation problematic.

Thierry
��

��