git - How to merge deleted files from another branch? -


i've learned how merge specific files branch this link. however, post not work merging deleted files. i've created git repository simulate situation, may try this. here example, 

$git clone https://github.com/gtchoi/so_question.git $git branch --track test origin/test $git checkout test $git checkout master -- . $git status  on branch test branch up-to-date 'origin/test'. changes committed:   (use "git reset head <file>..." unstage)      new file:   a.html $ls a.html      b.html      index.html

as , expected (please see the repository), compared current branch (test), a.html must added working tree, git manages a.html master branch, b.html still in working tree. i'd have b.html removed working tree since b.html deleted master branch. how can merge deleted files branch?

the problem seems b got added test branch independently master branch

enter image description here

if want make test identical master use e.g.

$ git reset --soft master  $ git status on branch test branch , 'origin/test' have diverged, , have 3 , 1 different commit each, respectively.   (use "git pull" merge remote branch yours)  changes committed:   (use "git reset head <file>..." unstage)          deleted:    a.html         new file:   b.html  $ git commit -am 'made identical master branch' [test 56ab8cb] made identical master branch  2 files changed, 1 insertion(+), 1 deletion(-)  delete mode 100644 a.html  create mode 100644 b.html

Comments

Post a Comment

Popular posts from this blog

android - Pass an Serializable object in AIDL -

i have defined aidl file interface imyfeature { void dotask(class clazz); } but need pass class object process. possible in android? if so, how? i tried: interface imyfeature { serializable class; void dotask(class clazz); } but doesn’t work. aidl in android supports custom class implement parcelable interface. in case want send class object not possible. can send class canonical name , retrieve in service. for example have aidl file interface imyfeature { void dotask(string classname); } then call : binder.dotask(myclass.class.getcanonicalname()); and in service binder stub implementation : private final imyfeature mbinder = new imyfeature.stub() { public void dotask(string classname) { try { class<?> clazz = class.forname(classname); constructor<?> ctor = clazz.getconstructor((class[]) null); object object = ctor.newinstance(); ...
Read more

How to provide Authorization & Authentication using Asp.net, C#? -

Image
i have asp.net application in c#. i have provide page authorization specific user/usergroup. i have created 2 tables in database: 1) pagename 2)permissions[insert, update, view, delete] but i'm unable match tables , permissions assigning... can 1 please me, how created tables in database , how coding. please me. you can below explanation. configure access specific file , folder, set forms-based authentication. request page in application redirected logon.aspx automatically. in web.config file, type or paste following code. this code grants users access default1.aspx page , subdir1 folder . <configuration> <system.web> <authentication mode="forms" > <forms loginurl="login.aspx" name=".aspnetauth" protection="none" path="/" timeout="20" > </forms> </authentication> <!-- section denies access files in...
Read more

How to use Authorization & Authentication in Asp.net, C#? -

i using roll management , trying give page , folder access according user or user group, using server created ad group user authentication. i have default1.aspx page default , subdir1 folder give different access separate user group i using below logic in web.config. <location path="subdir1"> <system.web> <authorization> <allow users ="?" /> </authorization> </system.web> </location> i facing problem provide same access 2 or more directory same user should have provide allow user code twice both folder? i can use logic repeating value folder want access providing in 1 logic. i have got answer configure folder/page access, have make different access shown below.. configure access specific file , folder, set forms-based authentication. request page in application redirected logon.aspx automatically. in web.config file, done following code. this code grants user...
Read more