git - How does one change a range of commits to have happened on another branch? -

-

My impression is that the solution is simple, but I can not find an example that clearly resolves my problem I do get guidance on the following:

I currently have a history: 

  a - - - c - - - - - f master \ \ B - - - d - e - - - g - h topic

d , e , g , And h must all be done on master . At this point only the difference should be B then it should look like:

a - - - c - d - e - f - g - h master b topic

or better yet: 

  A - C - D - E - F - G - H Master \ b topic

... but I do not know how to be completed

It does not seem that I have written D , e Can I merge into live , and . H all ends at I b with master .

I believe that I can raise them cherries, but it seems that to present future problems, what is the best solution?

If you are pushing these branches in any remote repo, this is not a good past history If you have pushed, then I would like to avoid writing again by doing this:

  1. Master 's F > Master
  2. Cherry-selected D , e , g and h .
  3. Merge with checkout subject and master .

If you do this, then you have: -> -> -> -> -> -> - - - - - - D '- E' - G ' - - - - - - - - - Topic -

History will not look super-clean, but you will have code for every code.

If you really want to re-write the history because it's just local for you or you do not care to mess with others who can pull from your repo: / P>

  1. Roll the master back to C (Note the hash before > F .).
  2. Cherry-pick D , e , F , g and HK on Master .
  3. Branch Topic2 to Master 's h head.
  4. The cherry-pick b at topic2 .
    5. Change the topic from topic , topic 2

And you get: 

  A - C - D - E - F - G - H Master B topic

Comments

Post a Comment

Popular posts from this blog

java - org.apache.http.ProtocolException: Target host is not specified -

-
I have written a simple httprequest / response code and I am getting this error below: I used to type in my classpath httpclient, httpcore, common -Codecs and general logging. I am very new to Java and I do not know what's going on here. Please help me. code: import org.apache.http.client.HttpClient; Import org.apache.http.client.methods.HttpGet; Import org.apache.http.HttpResponse; Import org.apache.http.impl.client.HttpClientBuilder; Import org.apache.http.Header; Import org.apache.http.HttpHeaders; Public class UnshorteningUrl {public static zero main (string [] args throws exception {HttpGet request = zero; HTTP Client Client = HTTP ClientBuilder.credit (). Build (); Try {Request = New HTTP Gate ("trib.me/1lBFzSi"); HttpResponse httpResponse = client.execute (request); Header [] header = httpResponse.getHeaders (HttpHeaders.LOCATION); // Preconditions.checkState (headers.length == 1); String new url = header [0] .getValue (); System.out.println ("new url...
Read more

c# - Chart control: Design messed Up after clearing and re-adding Y-Values -

-
Image
The day was struggling with this. I have three series on a chart that looks like this. Note: I am using vanof control. They are being added on the basis of input from the calculation. I am using this code to add value to each series. this.chart1.Series ["green"]. Points. AddY (greenvalue); This.chart1.Series ["totalsaving"] Points.AddY (totalsavingvalue). This.chart1.Series ["blue"] Points.AddY (bluevalue). I have set series properties like this. Both green and totalsaving are set to StackedColumn, the blue chart is set to the column for type. I started then To do is a button that brings the user back to the input field and then I am using this code to clear the series values ​​on the start code. chart 1. Series ["totaling"]. Points. clear (); Chart1.Series ["green"] Points.Clear () .; Chart1.Series ["blue"] Points.Clear () .; The same calculation click above is being calculated for the calculation of th...
Read more

api - Google Analytics with CakePHP -

-
I am trying to get data from my Google analytic account, I have been using a plugin for KPHP and its I am The plugin works, I can get a list of books from a specific author like the example. I want to display some information for cake from my Google Analytical Account. I have a few questions, how can I get Project_ID, IDs, secret? CorePPP of my plugin: $ Config = array ('GoogleAPI' => defines the option of array (/ ** * 'client' client) / 'Client' = & gt; array ('ApplicationName' = & gt; 'app', 'id' = & gt; '?', 'Secret' = & gt; '?', 'Developer key' & Gt; 'xxxxxxxxxxxxxxxxxxxx'),)); Test Controller: & lt ;? Php AP :: Usage ('app controller', 'controller'); Class Test Controller AppController {Public $ component = array ('GoogleAPI.GoogleAPI' => Array ('service' => array ('analytics')); Public function index...
Read more