Git: branches should isolate the changes, or should not? -


i thought had decent grasp of git, i've been surprised. thought branches isolate changes other branches, started big experimental refactoring in new branch. refactoring, implied moving many files. when switched master still see changes though!

i went sandbox repository replicate problem:

$ git branch crazy-refactoring $ git checkout crazy-refactoring $ rm readme $ git checkout master $ git status # on branch master # changes not staged commit: #   (use "git add/rm <file>..." update committed) #   (use "git checkout -- <file>..." discard changes in working directory) # #       deleted:    readme # no changes added commit (use "git add" and/or "git commit -a") $ ls readme ls: cannot access readme: no such file or directory

why? whole point of me creating branch, try something, , throw away if unsuccessful. toughts?

you did not commit delete. committed changes "isolated".

regarding comment:

maybe i'm missing something, seems me weird , undesirable behavior.

think it:

you deleted readme in crazy-refactoring did not commit change. git knows changed file , did not commit it. in order preserve changes, not override them if checkout branch.
otherwise there no way git know changes have been when switch branch made changes in. lost, , far more worse seeing changes in other branch.

you current working directory current branch + uncommitted changes (unless reset them).

of course, git warn when checking out other branch, have uncommitted changes, desired keep changes and switch branch.


Comments

Post a Comment

Popular posts from this blog

c# - SharpSVN - How to get the previous revision? -

i trying find efficient way previous revision of file text comparison using sharpsvn. using (svnclient c = new svnclient()) { c.authentication.defaultcredentials = new networkcredential( configurationmanager.appsettings.get("svnserviceusername") , configurationmanager.appsettings.get("svnservicepassword") , configurationmanager.appsettings.get("svnservicedomain") ); c.authentication.sslservertrusthandlers += new eventhandler<svnsslservertrusteventargs>(authentication_sslservertrusthandlers); collection<svnfileversioneventargs> fileversioncollection = new collection<svnfileversioneventargs>(); svnrevisionrange range = new svnrevisionrange(0, this.hooks.revision); svnfileversionsargs args = new svnfileversionsargs(); args.retrieveproperties = true; args.range = range; foreach (svnchangeitem item in log.changedpaths) { string path = this.repositorypath + it...
Read more

c++ - Is it possible to compile a VST on linux? -

for class project i'm attempting write vst plugin backed cuda. current cuda workflow on linux box, i'd prefer compile , link there. according wikipedia , should possible (i couldn't find steinberg documentation relevant linux) can't find makefile or instructions on how build if aren't using xcode or visual studio. i'm vst 3 sdk doesn't support linux. when try compile plugin under linux, error: ./base/source/fatomic.cpp:39:30: fatal error: libkern/osatomic.h: no such file or directory this issue caused following code in "vst3 sdk/base/source/fatomic.cpp" #if mac #include <libkern/osatomic.h> #if mac_os_x_version_min_required > mac_os_x_version_10_4 #define native_atomic_type (volatile int32_t*) #else #define native_atomic_type (int32_t*) #endif #elif windows #include <windows.h> #endif but hope compiling under linux work vst sdk 2.4. reading. jvstwrapper seems run on lin...
Read more

url - Querystring manipulation of email Address in PHP -

i using third party application (email2http) send me emailid, body , message. unable retrieve email id due name appended on , enclosed < , >. here querystring getting. test.php?from=ajay+reddy &subject=cx&body=somebody when print variable in php returns name , not email id. $from = $_get['from']; echo $from; //output ajay reddy please suggest me how can emailid also. i dont want use post method due testing , debugging. it's working fine. forgot use htmlentities() in debugging.
Read more