git - Accidentally created new branch with existing name -

-

i'm starting use branches git, , created yesterday branch foo , pushed remote. today wanted work on home, after running pull typed without thinking git checkout -b foo.

i know shouldn't have added -b option, because got message switched new branch 'foo' , none of code wrote yesterday shows in folders figure accidentally messed branch names.

i tried renaming branch using git branch -m foo bar hoping deal local branch , deduplicate branch names, alas git checkout foo issued message error: pathspec 'foo' did not match file(s) known git.

how can retrieve branch created yesterday?

the problem ran created new branch did not track remote branch wanted.

i think "right" way correct set branch track intended remote branch:

git checkout foo git branch -u origin/foo

after doing can move local branch current commit of remote branch

git reset origin/foo

you can add , commit local changes. pull , push usual.

(an alternative reset rebase on origin/foo instead, not recommend beginner)


Comments

Post a Comment

Popular posts from this blog

c++ - llvm function pass ReplaceInstWithInst malloc -

-
#include "llvm/pass.h" #include "llvm/ir/module.h" #include "llvm/ir/function.h" #include "llvm/support/raw_ostream.h" #include "llvm/ir/legacypassmanager.h" #include "llvm/ir/instrtypes.h" #include "llvm/transforms/ipo/passmanagerbuilder.h" #include "llvm/ir/irbuilder.h" #include "llvm/transforms/utils/basicblockutils.h" using namespace llvm; namespace { struct replacepass : public functionpass { static char id; replacepass() : functionpass(id) {} virtual bool runonfunction(function &f) { allocainst* insttoreplace = ??? basicblock::iterator ii(insttoreplace); replaceinstwithinst(insttoreplace->getparent()->getinstlist(), ii, new allocainst(type::int32ty, 0, insttoreplace)); return true; } }; } char replacepass::id = 0; static void registerreplacepass(const passmanagerbuilder &, legacy::passmanagerbase &pm) { pm.add(new re...
Read more

Cross-Compiling Linux Kernel for Raspberry Pi - ${CCPREFIX}gcc -v does not work -

-
i'm trying follow this guide . i'm running both ubuntu 12.04.5 lts (gnu/linux 3.13.0-74-generic x86_64) on "real" hardware , 14.04.1 via virtualbox on mac. problem don't past step 1: hoffmann@angl99:~$ export ccprefix=/home/hoffmann/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf- hoffmann@angl99:~$ ${ccprefix}gcc -v i'm getting following error: -bash: /home/hoffmann/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-gcc: no such file or directory however, file i'm told missing there: hoffmann@angl99:~$ less /home/hoffmann/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-gcc "/home/hoffmann/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-gcc" may binary file. see anyway? this result of basic error/misconception. suggest solution? thanks! sebastian ok - i've worked out (with of person po...
Read more

java.lang.NoClassDefFoundError When Creating New Android Project -

-
i've tried installing (and re-installing) android studio several times now, , each time, studio isn't able create new android project. when attempt initial android studio window (ie. basic 'create', 'open', 'import' etc options), i'm asked of questions in wizard, brief progress dialog, followed nothing @ all. if open incomplete project process creates choosing 'open' list, can try choosing create new android project menu. this has same issue, error message in output console time... java.lang.noclassdeffounderror: com/sun/xml/internal/bind/v2/model/annotation/annotationreader (wrong name: com/sun/xml/internal/bind/v0/model/qnnotation/annotationreader) note: when installed android studio, installed incompatible jdk (1.8, not 1.7). have had go default project settings change jdk uses 1.8. does know how can avoid this? there place should downloading jxb classes? missing in java paths? this appears have been caused cor...
Read more