Hi Andrew at 23.06.2011 00:56, Andrew wrote: > 23.06.2011 00:19, Erich Titl пишет: >> on 22.06.2011 22:03, Andrew wrote: >>> 22.06.2011 22:15, Erich Titl пишет: >>>> HI Andrew >>>> >> ... >>>> git pull >>>> et...@leaf.git.sourceforge.net's password: >>>> error: Entry 'buildtool/COPYING' not uptodate. Cannot merge. >>>> fatal: merging of trees e706444b7869ff20f2b976ed830388f288581773 and >>>> 5ee7f8db6b0ed48d0e927c20dcd3028b1719359a failed >>>> Merge with strategy recursive failed. >>>> >>>> needless to say, I never touched COPYING >>>> >>>> Although GIT might be a great tool, either we cannot use it or there is >>>> something completely wrong. >>>> >>>> Could someone set this somehow right. This is just a great waste of energy >>>> >>>> cheers >>>> >>>> Erich >>> Do 'git reset --hard' to sync all files to repo, then try again. >>> On what commit you are now (top in 'git log')? >> commit 34194ece30b6f2c9252042a146a5edd8696aa666 >> Merge: 8262599... 72d572c... >> Author: mega<m...@luna.think.ch> >> Date: Sun Jun 19 12:07:11 2011 +0200 >> >> Merge branch 'master' of >> ssh://et...@leaf.git.sourceforge.net/gitroot/leaf/leaf >> >> Erich >> > It seems that you have at least one unpushed commit. > Easiest and most predictable way to resolve this IMHO todo next steps: > 1) Mark this commit as new branch (git branch experimental) > 2) Rollback to commit from remote tree (git reset --hard 72d572c) > 3) Do 'git pull' (this will pull all changes of original repo) > 4) Switch to your experimental branch and do 'git rebase master' (this > will apply all commits from master branch to your experimental one)
What state will this leave my repository in? With a crippled
experimental branch?
I am afraid I do not understand the semantics of GIT at all. I googled
GIT switch branch and all I got is checkout? All weird semantics to me,
what does checkout have to do with switching to a branch?
Ayway, would you suggest to do the above before or after the tree
changes? I guess the above applies to the old tree?
cheers
Erich
>
> If something will go wrong on 4th step - you can always do roll-back
> ('git rebase --onto 72d572c master' on experimental branch).
>
> ------------------------------------------------------------------------------
> Simplify data backup and recovery for your virtual environment with vRanger.
> Installation's a snap, and flexible recovery options mean your data is safe,
> secure and there when you need it. Data protection magic?
> Nope - It's vRanger. Get your free trial download today.
> http://p.sf.net/sfu/quest-sfdev2dev
>
> _______________________________________________
> leaf-devel mailing list
> leaf-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/leaf-devel
smime.p7s
Description: S/MIME Cryptographic Signature
------------------------------------------------------------------------------ Simplify data backup and recovery for your virtual environment with vRanger. Installation's a snap, and flexible recovery options mean your data is safe, secure and there when you need it. Data protection magic? Nope - It's vRanger. Get your free trial download today. http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
