how to pop git stash without triggering an auto-merge -

-

the short version of question this: how can pop git stash without triggering auto-merge?

now longer version...

consider following toy example of alternative git stash ... + git pull ... + git pop.

first, git status shows modification in working directory tracked file foo.

# on branch master # changes not staged commit: #   (use "git add <file>..." update committed) #   (use "git checkout -- <file>..." discard changes in working directory) # #   modified:   foo # no changes added commit (use "git add" and/or "git commit -a")

now, in order reset working directory clean state, pre-requisite running git pull, temporarily rename modified file foo (to untracked name), , restore version of foo in head...

% mv foo foo.$(date +%y%m%dt%h%m%s) % git checkout foo % git status # on branch master # untracked files: #   (use "git add <file>..." include in committed) # #   foo.20130508t110014 nothing added commit untracked files present (use "git add" track)

ok, run git pull, which, sake of example, may assume fast-forward:

% git pull

lastly, restore temporarily renamed foo.

% mv foo.20130508t110014 foo

...and i'm to

% git status # on branch master # changes not staged commit: #   (use "git add <file>..." update committed) #   (use "git checkout -- <file>..." discard changes in working directory) # #   modified:   foo #

this "moral equivalent" of git stash save + git pull + git stash pop, except former, , not latter, is immune "merge conflicts", one:

% git stash save 'wip' % git pull % git stash pop auto-merging foo conflict (content): merge conflict in foo

how can replicate rename-checkout-pull-rename sequence above using git stash save + ... + git stash pop, without triggering auto-merge?

edit: incidentally, rename-checkout-...-rename routine more closely represents expect command called stash. iow: save state of working directory now, , replace later. there's no "merge" in picture.

stash merges, that's how works.

you can achieve non-merge-y stash with write-tree read-tree , checkout-index. here's worked example doing achieve pristine test environment.

to brute-force no-merge stash apply, e.g.

git read-tree stash^{tree} git checkout-index -af

Comments

Post a Comment

Popular posts from this blog

java - Jmockit String final length method mocking Issue -

-
using jmockit 1.2 jar, trying mock string's length method getting unexpected invocation exception: failed: test java.lang.illegalstateexception: missing invocation mocked type @ point; please make sure such invocations appear after declaration of suitable mock field or parameter @ stringdemo.testa$1.<init>(testa.java:17) @ stringdemo.testa.test(testa.java:13) i using testng: @test public void test() throws exception { new expectations() { @mocked("length") string astring; { astring.length(); result = 2; } }; system.out.println(a.showa("test")); } } actual class a: public class { public static int showa(string str){ int a= str.length(); return a; } } this wrong way of recording expected results. shouldn't mock , record string's length() method, record showa() instead. here solution @suppresswarnings("unused...
Read more

What is the difference between data design and data model(ERD) -

-
i have google question , find answer in day. know, data design many many table have list column,and mark pk , fk. why er-diagram have find this? data design process of designing database. main output of data design detailed logical data model of database. some people data design includes of needed logical , physical design choices , physical storage parameters needed generate design in data definition language. technically, database analysis, database analysts (dbas) trained do. while person can both data design , database analysis, these 2 different tasks. data design models data. database analysis takes model , applies 1 or more database engines (relational, hierarchical, nosql). a logical data model 1 of main outputs of data design. data model represented entity relationship diagram, or er diagram.
Read more

ios - Can NSManagedObject conform to NSCoding -

-
i need transfer single object across device. right converting nsmanagedobject dictionary , archiving , sending nsdata. upon receiving unarchiving it. transfer nsmanagedobject archiving , unarchiving instead of creating intermediate data object. @interface test : nsmanagedobject<nscoding> @property (nonatomic, retain) nsstring * title; @end @implementation test @dynamic title; - (id)initwithcoder:(nscoder *)coder { self = [super init]; if (self) { self.title = [coder decodeobjectforkey:@"title"]; //<crash } return self; } - (void)encodewithcoder:(nscoder *)coder { [coder encodeobject:self.title forkey:@"title"]; } @end nsdata *archivedobjects = [nskeyedarchiver archiveddatawithrootobject:testobj]; nsdata *objectsdata = archivedobjects; if ([objectsdata length] > 0) { nsarray *objects = [nskeyedunarchiver unarchiveobjectwithdata:objectsdata]; } the problem above code is. crashes @ self.title in initwithcoder sa...
Read more