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

java - Gradle dependencies: compile project by relative path -

-
Is it possible to specify a dependency on another gradeal project in the granular (in android studios) outside the current project limits? For example, with a relative path like this: dependence {collection project ('../../ stdlib / dagger'}} MyApp (path / user / foo / workspace / mypad) The app (Path / User / Foo / Workspace / MyPass / App) And I have an Android Library Project with 3 subdomules: stdlib (path is / user / foo / Utilities (Path / User / Foo / Workspace / Stadlib / Utilis) http (Path / User / Foo / Workspace / Stadlib / HT) / Li> What I have to do is compile the Dagger, Util, http module in the MyApp project. The Stidelib Library module under heavy development And MyApp will grow in the form of Growth, so I do not want to push them into a Mewen repository. I am a little change. is likely to add another Gredle projects in some way? I will push the study library into the Maven repository after the source is in search of a temp...
Read more

ruby on rails - Object doesn't support #inspect when used with .include -

-
So I have participated in a glitch error that I do not even know how to debug. I am very new to the railing, so it has kicked my ass well when I use the .includes (school) seen by the student, it gives a blue box error, But when I look at any other model and .includes (school) , the school works just fine. class student & lt; ActiveRecord :: Base has has_many: relationships, foreign_key: "liker_id", dependent :: has_many: matches, foreign_key: "student_1_id", dependent :: deleted belong_to: school belong_to: conference belong_to: would_you_rather belong_to: home city belong_to: year is_to: Major and class school & lt; on the console activatecord :: Affiliate for the base: conference includes: respondent, class: "school", foreign_key: "rival_id" (e.g. For: School) Select SQL generated Select "School". * "School" from "school" "ID" IN (1) error message back NoMethodError: u...
Read more