Git merge failed to bring over some files -


i did large merge develop master , git handled correctly. there 3 files existed in both branches prior merge git recognized old ones in master, marked added us. expected instead conflict resolve, because wanted changes exist in develop. thing let me resolve either add them (meaning i'd keeping old master version or remove them. choose latter , attempted merge, says i'm up-to-date. files exist in develop not in master, git seems have no clue this. why won't git let me bring these files on , can resolve this?

so there 3 files in develop want in master. try this

git checkout master  # make sure on master branch  git checkout develop -- name_of_file_1.ext name_of_file_2.ext name_of_file_3.ext

this should bring on 3 files want develop in recent state.


Comments

Post a Comment

Popular posts from this blog

blackberry 10 - how to add multiple markers on the google map just by url? -

i have android application, want convert blackberry 10 , google map needed in app,but blackberry 10 not support googlemap , blackberry developer web site supply way replace it.the sample below: @override public void oncreate(bundle savedinstancestate) { super.oncreate(savedinstancestate); setcontentview(r.layout.main); webview webview = (webview) findviewbyid(r.id.mywebview); webview.getsettings().setjavascriptenabled(true); webview.loadurl("http://maps.google.com/?ll=36.97, -122&lci=bike&z=13&t=p"); } i cannot understand it,i not know how add multiple markers on googlemap via url? can me? this worked me map shown in webview.
Read more

php - guestbook returning database data to flash -

i've been struggling problem long , unable make work, hope can me it. first, know php files correct , mysql database works fine. in flash, able submit comment database comments not display. did many tests such making returned_database flash separately , worked fine - can see old comments. long combine submitting 1 , returning 1 together, flash doesn't show comments more. put lower version flash effects on frame thinking doesn't collaborate returning flash, submitting flash works fine. since pretty complex problem hard me copy actionscript code because on different frames in flash. if has ideas fixing maybe can send file you?
Read more

delphi - Dynamic file type icon -

i want register file type in windows , make program delphi draw icon of file according contents (something custom icon format). how can this? thanks nortd , user539484 comments, searched internet "shell icon handler delphi" , found sample here , , shell+ components has component this.
Read more