merge - Git - master change, rebase onto complex branches? -



merge - Git - master change, rebase onto complex branches? -

this question has reply here:

rebasing branch including children 2 answers

so have complex local branch structure: main working local branch, , 2 other branches off of it. there new alter in master want in branches. best way propagate of branches? rebasing possible?

a---e---m master \ f---g---h local_branch_main |\ | i---j local_subbranch_1 \k---l local_subbranch_2

ideally, i'd want move branches reference off of new master commit (there no conflicts):

a---e---m master \ f---g---h local_branch_main |\ | i---j local_subbranch_1 \k---l local_subbranch_2

you can way

first do

git checkout local_branch_main git rebase master

if lucky , don't have conflicts repository this:

a---e---m master \ \ \ f'---g---h local_branch_main f |\ | i---j local_subbranch_1 \k---l local_subbranch_2

now here comes interessting part. can see commit f , f' contains same changes (if there no conflicts), f' has parent commit , commit id. create visible naming f'.

so can switch branch local_subbranch_1 , rebase on f'

git checkout local_subbranch_1 git rebase f'

of course of study must replase f' commit id of f'

now repository looks this

a---e---m master \ \ \ f'---g---h local_branch_main f \ \ i---j local_subbranch_1 \ k---l local_subbranch_2

finally can checkout local_subbranch_2 , rebase on f' , repository like

a---e---m master \ f'---g---h local_branch_main |\ | i---j local_subbranch_1 \ k---l local_subbranch_2

i have created demo repository can download here. can replay steps above on it.

git merge rebase

Comments

Post a Comment

Popular posts from this blog

c - Compilation of a code: unkown type name string -

c - Compilation of a code: unkown type name string - i have next lines of code compiler says following: "unknown type name 'string'" both in declaration , definition of function. can tell me what's wrong? thanks. #include <stdio.h> #include <stdlib.h> #include <string.h> void frecognizeclient(string *actualclient) there no string type in c. need utilize array so: char array[10]; then can pass in function: void frecognizeclient(char *actualclient); c arrays string compilation
Read more

ubuntu - Bash Script to Check That Files Are Being Created -

ubuntu - Bash Script to Check That Files Are Being Created - we have amazon ec2 instance upload output our security cameras. every , then, cameras have issue, stop uploaded, , need rebooted. easy way determine seeing if files not beingness created. problem creates lots , lots of files. if utilize find -ctime, takes long time script run. there faster way check see if files have been created since yesterday? need capture result, (yes there files, or not there not,) , email message, nice have didn't take half hr run. #!/bin/bash find /vol/security_ftp/west -ctime -1 find /vol/security_ftp/backentrance -ctime -1 find /vol/security_ftp/boardroomdoor -ctime -1 find /vol/security_ftp/mainentrance -ctime -1 find /vol/security_ftp/north -ctime -1 find /vol/security_ftp/south -ctime -1 using find natural solution, if must avoid it, can see newest file in directory using ls , sorting output according ctime, eg. ls /vol/security_ftp/west -clt | head --lines=1 ...
Read more

Php operator `break` doesn't stop while -

Php operator `break` doesn't stop while - have weird issue, break doesn't break while loop , maintain rotating. logically should break cycle , set output while ($c++ != 5) { // here curl request, doesn't relevant have removed preg_match("!<.*?>(\s*)[^<>]*?{$to}<!", $resp, $result) ; // echo 'cnt = ' .count($result).'<br>'; if(!count($result)) { $amount = 0; echo 'sleep called'; sleep(4); exit; continue; } else { $amount = trim(@$result[1]); $amount = round($amount + $amount * $exchange_ratio, $precision); echo 'break happen<br>'; break; } } so output cnt = 2 break happen cnt = 0 sleep called so skipped break , maintain rotating. how so? edit works fine on localhost issue php version? ...
Read more