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

java - Bypassing "final local variable defined in an enclosing type" -

java - Bypassing "final local variable defined in an enclosing type" - i'm writing programme , i'm getting "the final local variable asd cannot assigned, since it's defined in enclosing type". i provide illustration not code produces error aswell. have arraylist utilize later (if define within button can't utilize later on), outside of button, pressing button should give values arraylist. in illustration "create new arraylist" cause same problem. button btn = new button("asd"); final arraylist asd = new arraylist(); btn.setonaction(new eventhandler<actionevent>() { public void handle(final actionevent event) { asd = new arraylist(); //here's error.. } }); clear arraylist , add together values. java javafx
Read more

json - Hibernate and Jackson (java.lang.IllegalStateException: Cannot call sendError() after the response has been committed) -

json - Hibernate and Jackson (java.lang.IllegalStateException: Cannot call sendError() after the response has been committed) - hello have problem hibernate , jackson. have 2 pojos @entity @table(name = "users") public class user implements serializable { static final long serialversionuid = 4235637833262722256l; @id @generatedvalue private int id; @column(name = "creation_date") private date creationdate; @column(name = "first_name") private string firstname; @column(name = "last_name") private string lastname; @version @column(name = "version") private int version; @column(name = "e_mail") private string email; @column(name = "enabled") private boolean enabled; @column(name = "login") private string login; @column(name = "password") private string password; @jsonmanagedreference("role") @onetomany(mappedby = "user", cascade = cascadetype.all,fetch = fetchtyp...
Read more