git - How to squash the old commit and a recent merge commit -


when 2 commits made me 1 after another, can squash them 

git rebase -i origin/{branch}~1 {branch}

but sequence of commits different:

  1. my commit
  2. merge upstream: merge branch 'master' of github.com:...
  3. this pushed origin.

now git log , pull request show both original commit , merge commit. above rebase command shows other's commits came upstream, , no merge commit reason.

so how can squash commits if git rebase doesn't show them?

rebase removes merge commits entirely. reason simple enough: rebase copies commits, turning them changes , applying changes new base (hence name "re-base"). once copied, "abandon" original commits in favor of shiny new copies:

... <--b <--c   <-- master         \          d <--e <--f   <-- branch

becomes:

... <--b <--c   <-- master              \               d' <--e' <--f'  <-- branch

where d' shiny new copy of d, , on. in other words, rebase collects string of commits such d-e-f, turns them "what's different b d, what's different d e, , what's different e f. git can apply same changes c make d', re-apply d-vs-e changes d', , on.

it's unwise rebase any published (pushed) commit, unless pre-arrange else shares pushed-to repository understand , able coordinate this. essentially, they—the other people—are using commits you're abandoning in favor of shiny new ones; must also abandon commits in favor of shiny new ones, or else bring back old / dirty / broken / whatever commits.

merge commits have no clear way turned changes, have two previous (or parent) commits, rather one, , changes in merge result of combining changes each parent. (it's possible create new merge, pretty tricky, , it's not safe combine normal interactive rebase.)


Comments

Post a Comment

Popular posts from this blog

inversion of control - Autofac named registration constructor injection -

does autofac support specifying registration name in components' constructors? example: ninject's namedattribute . you need use autofac.extras.attributed package on top achieve this so let's have 1 interface , 2 classes: public interface ihello { string sayhello(); } public class englishhello : ihello { public string sayhello() { return "hello"; } } public class frenchhello : ihello { public string sayhello() { return "bonjour"; } } then have consumer class, in want select instance injected: public class helloconsumer { private readonly ihello helloservice; public helloconsumer([withkey("en")] ihello helloservice) { if (helloservice == null) { throw new argumentnullexception("helloservice"); } this.helloservice = helloservice; } public string sayhello() { return this.helloservice.sayhello()...
Read more

verilog - Systemverilog dynamic casting issues -

i've code snippet following in testbench function void write_to_port( my_data_type_base data ); my_data_type_extended data_ext; if(!$cast(data_ext, data)); `uvm_error(get_type_name(), "failed cast"); `uvm_info(get_name(), $psprintf("data_ext :\n%s", data_ext.sprint()), uvm_medium) // write data_ext out port.... endfunction when run it, i'm getting uvm_error "failed cast." i'm not quire sure why $cast not returning 1. can see, i'm printing out extended class data item after casting uvm_info. can see it's being cast properly. if don't use $cast if condition, don't runtime error. isn't coding practice use if dynamic cast check if $cast returning 1 ? what might reason behind cast not returning 1 in above case? i think semicolon on line 'if' not belong? i think consumes if statement, , uvm_error executes regardless of how if evaluates: if(!$cast(data_ext, data)); <- no semico...
Read more

ios - Change Storyboard View using Seague -

i have following code checks connection server, , depending on want change views if no connection found. nsstring *connect = [nsstring stringwithcontentsofurl:[nsurl urlwithstring:@"http://myserver.com"] encoding:nsutf8stringencoding error:nil]; if (connect == null) { [self performseguewithidentifier:@"network_failure" sender:self]; } else { // other code here } my problem not change views. have added storyboard segue between 2 views identifier of network_failure . not have navigation controller or that, problem? thanks help! no not problem. first of all, in objectivec exists nil object oriented null . must use that. so: if(connect == nil) or better: if(!connect) so due fact nil not same of null , probably code does't enter in if scope . you have been able discover breakpoint. anyway: be sure set trigger segue (line) 2 view controller , , name network_failure (that not best name. should instead view1toview2 ) as, m...
Read more