Merging git branch A into branch B once again after the first merge has been reverted -


my situation presented below.

              o---o---o issue-2               /         \ o---o---o---o---m---r---o develop          \     /           o---o---f issue-1

there work on issue-1. after review, merged develop (commit m). unfortunately, discovered there serious errors present. sake of other issues merge commit reverted (commit r). later, other issues (like issue-2) merged develop. code on original branch fixed (commit f).

the problem - how merge issue-1 develop now? simple merge keep effect of revert commit r , apply changes not in develop branch (commit f), not of them.

there few options:

  1. revert revert
    • pros: approach recommended git documentation, , it's easy do
    • cons: uglies history, makes little more difficult people understand how code evolved on time (e.g., git blame show revert of revert instead of individual commits on issue-1 branch)
  2. rebase reverted branch , merge
    • pros: git blame , other history digging tools make easier understand code history
    • cons: looking @ history can bit confusing (why there 2 seemingly identical sets of commits in history? did botch rebase?)
  3. edit history: redo develop branch remove both commit m , commit r
    • pros: cleanest end result
    • cons:
      • dangerous if repository shared, unless users git , have communicated plan everyone
      • difficult because git doesn't have easy history editing tool:

in general approach recommend revert revert. suggest following these detailed steps:

  1. check out original bad branch:
    git checkout issue-1
  2. merge in latest commits parent branch:
    git merge --no-ff develop
  3. revert revert (where r sha1 id of revert commit):
    git revert r
  4. fix flaws in branch. (you've done in commit f; others' sake i'll assume need make additional fix.)
  5. test test test
  6. switch parent branch:
    git checkout develop
  7. merge in repaired branch:
    git merge --no-ff issue-1

the resulting graph should this:

              o---o---o issue-2               /         \ o---o---o---o---m---r---o-------------o develop          \     /         \           /           o---o---f-------o---rr---f2 issue-1

it's not pretty, people should able figure out what's going on.


Comments

Post a Comment

Popular posts from this blog

php - failed to open stream: HTTP request failed! HTTP/1.0 400 Bad Request -

this code i'm using find latitude , longitude of place: function coords($address){ echo $url="http://maps.googleapis.com/maps/api/geocode/json?address=".$address; $json = file_get_contents(urlencode($url)); $data = json_decode($json, true); print_r($data['results'][0]['geometry']['location']['lat']); print_r($data['results'][0]['geometry']['location']['lng']); } however returns warning: failed open stream: http request failed! http/1.0 400 bad request if use above code in simple procedure works fine not in function. note: have tried curl_init()... method produced same result? instead of encoding whole url encode address part. following code work fine $add='jamshoro phase 2'; $url="http://maps.googleapis.com/maps/api/geocode/json?address=".urlencode($add); $json = file_get_contents($url); $data = json_decode($json, true); print_r($data['r...
Read more

command line - Use qwinsta in PowerShell ISE -

i trying use qwinsta , rwinsta powershell code. when try run error "the term 'qwinsta' not recognized name of cmdlet, function, script file, or operable program." need able remotely on several machines without having add .dll's or modules other machines. tried terminal services powershell module, need able put on remote machines , not able that. within powershell ise how run qwinsta? not looking parse information gather it. following code have tried (which had found on site also): function get-tssessions { param( $computername = "localhost" ) qwinsta /server:$computername | #parse output foreach-object { $_.trim() -replace "\s+","," } | #convert objects convertfrom-csv } get-tssessions -computername "localhost" | ft -autosize best have running powershell ise (x86). when run command qwinsta there same error you. of course assuming have 64-bit os. th...
Read more

java - Incorrect order of records in M-M relationship in hibernate -

Image
i have 4 records in bridge table in mysql database. using @manytomany in hibernate, accurate order of employees incorrect incorrect of projects. following required material figure out doing mistake. this source. @entity @table(name="project") public class projectbean { @id @generatedvalue @column(name="project_id") private int projectid; @column(name="title") private string projecttitle; @manytomany(mappedby="projects") private collection<employeebean> employees; public projectbean() { employees = new arraylist<employeebean>(); } //getters & setters } @entity @table(name="employee") public class employeebean { @id @generatedvalue @column(name="employee_id") private int employee_id; @column(name="first_name") private string ...
Read more