rebase - Reorganising git commits into different branches -


i trying reorganise git tree structured bit better. @ moment have single master branch couple of small feature branches split it. want go , reorder commits in main branch ones corresponding new version numbers , have in between commits reside in separate develop branch feature branches split too. i'm looking tool let me manually reorganise tree. thought maybe interactive rebasing looking trying in sourcetree makes seem not right tool.

can give me advice on how best proceed. below diagram of current structure:

featurea                       x-x-x                                  /     \ master     a-x-x-x-x-b-x-x-x-c       d

desired structure:

feature                   x-x-x                          /    | develop     x-x-x-x-x-x-x    -            /      |     |     | master       -  b  -  c  -  d

having linear history -like current structure- wanted many people. if want try new workflow, adopting on, without changing past? save trouble.

however, if want change it, do:

#start put tags on 'main' commits, ease manipulations git checkout b git tag tagb git checkout b git tag tagb git checkout d git tag tagd  #start rewrite oldest #not do: need add merge commit git checkout git merge --no-ff b git branch -f master  #continue c #same thing, need cherry-pick intermediate commits git checkout tagb git cherry-pick c~3 git cherry-pick c~2 git cherry-pick c~1 git cherry-pick c git merge --no-ff master git branch -f master  #continue d ...

to ease manipulations , ensure know going on, should open gitk --all head in background, , regularly press f5 refresh it.

and if think messed up, , want retrieve initial state, you'd need do

git checkout tagd git branch -f master

a final word: if shared commits (eg: if pushed), should warn have them, you're going change structure of history. otherwise lead real mess.


Comments

Post a Comment

Popular posts from this blog

commonjs - How to write a typescript definition file for a node module that exports a function? -

consider, toml node module can use: // toml.d.ts declare module toml { export function parse(value:string):any; } declare module "toml" { export = toml; } then: /// <reference path="../../../../../defs/toml/toml.d.ts"/> import toml = require('toml'); toml.parse(...); however, node module export single function, such 'glob' ( https://github.com/isaacs/node-glob ). the node usage of module be: var glob = require("glob") glob("*.js", {}, callback(err, files) { ... }); you'd naively expect this: // glob.d.ts declare function globs(paths:string, options:any, callback:{(err:any, files:string[]):void; ...but because typescripts 'import' semantics bit strange, seems can use 'import .. = require()' statement alias modules . trying call: /// <reference path="../../../../../defs/glob/glob.d.ts"/> import blog = require('glob'); results in: error ts2072: mod...
Read more

openid - Okta: Failed to get authorization code through API call -

i'm integrating okta own idp server using okta's api. i'm implementing authorization code flow following steps below: in own server, use /api/v1/authn endpoint sessiontoken. use sessiontoken obtain authorization calling endpoint: /oauth2/v1/authorize?client_id=" + clientid + "&sessiontoken=" + sessiontoken + "&response_type=code&response_mode=query&scope=openid&redirect_uri=" + redirecturl + "&state=evanyang&nonce=" it's supposed return response status code 302 , location header containing redirect url code value. however, keep getting response status code 200 , without location header, html body saying "you using unsupported browser." , "javascript disabled on browser." according api documentation: http://developer.okta.com/docs/api/resources/oidc.html#authentication-request , sessiontoken parameter sufficient this: an okta one-time sessiontoken. allows api-based ...
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