git - Move commits from one branch to another with almost the same file contents but completely different commit history -

-

ok, have got multi-commit task on branch devel. have move changes branch (production), before month ago, had peculiar system of deployment - after checking on devel, person needed integrate new changes making new commit , integrate manually. don't want that, have 2 branches weren't merged 1,5 years, want move commits, , make new devel branch.

the tree looks that:

ft1 -----------c--------------  dev ---a---b-------d-------e---  prod --f---------------g-------

and want be

ft1 -----------c--------------  dev ---a---b-------d-------e---  prod --f---b-------d---g---e---

how can accomplish it?

inserting b , d commits between f , g not quite normal workflow, no matter vcs 1 uses.

if don't mind applying commits b, d , e on prod branch after g git rebase comes rescue.

git rebase --onto prod dev

as explained in the documentation, command above checks out dev branch, saves commits in current branch (dev) not in a branch (i.e. commits b, d , e) temporary area, checks out prod branch , applies saved commits, 1 one, in original order.

if doesn't fail (because of conflicts) branches this:

ft1 -----------c-------------- dev ---a---b-------d-------e--- prod --f---------------g---b---d---e

if fails have 2 options:

  • resolve conflicts, commit run git rebase --continue; repeat if needed until commits rebased;
  • abort rebase running git rebase --abort; restore repository in original state.

how achieve desired status

however, if insist on applying b , d commits before g can use git cherry-pick.

create new branch (let's name new) starting on commit f , check out. cherry pick commits want, in order want (b, d, g, e):

git checkout -b new f git cherry-pick b git cherry-pick d git cherry-pick g git cherry-pick e

if cherry-picks succeed you're done. hard reset branch prod new remove don't need more (branches dev , new):

git checkout prod git reset --hard new git branch -d new dev

if of cherry picks fail have same 2 options before:

  • either resolve conflicts, commit , continue (git cherry-pick --continue);
  • or abort everything: checkout branch prod , remove branch new.

Comments

Post a Comment

Popular posts from this blog

Capture and play voice with Asterisk ARI -

-
there channel ari demo in wich can control channel state: ring, answer, play silence, play tone or audio-file ( https://github.com/asterisk/ari-examples/tree/master/channel-state , https://wiki.asterisk.org/wiki/display/ast/ari+and+channels%3a+manipulating+channel+state ) possible receive chunks (parts, buffers, etc.) of call voice (which created remote subscriber) or write chunks of voice, example array of bytes (not file) in audio format (alaw, ulow etc). you can use asterisk eagi interface voice data. other option use record or mixmonitor app record channel(channel have put stasis allow dialplan control ari) "write chunks of voice" can done application playback also can create own application using c/c++, compile asterisk , result want. no, can't redirect voice directly using ari.
Read more

c - Unrecognised emulation mode: elf_i386 on MinGW32 -

-
i'm trying make kernel, , cannot link c output assembly. ld . i'm getting error: unrecognized emulation mode: elf_i386 i'm using windows 10 professional mingw32 , msys. code using: link.ld /* * link.ld */ output_format(elf32-i386) entry(start) sections { . = 0x100000; .text : { *(.text) } .data : { *(.data) } .bss : { *(.bss) } } kernel.c /* * kernel.c */ void kmain(void) { const char *str = "my first kernel"; char *vidptr = (char*)0xb8000; //video mem begins here. unsigned int = 0; unsigned int j = 0; /* loops clears screen * there 25 lines each of 80 columns; each element takes 2 bytes */ while(j < 80 * 25 * 2) { /* blank character */ vidptr[j] = ' '; /* attribute-byte - light grey on black screen */ vidptr[j+1] = 0x07; j = j + 2; } j = 0; /* loop writes string video memory */ while(str[j] != '\0') { /...
Read more

magic numbers - Java's checkstyle, MagicNumberCheck -

-
i using checkstyle reportings source-code. question magicnumbercheck . i using date/(org.joda.)datetime in source code this: datetime datetime = new datetime(2013, 2, 27, 23, 0): datetime.plushours(57); is there way suppress magicnumbercheck notifications if magic number within date or datetime? you can use suppressioncommentfilter check this. configure properties values (in checkstyle configuration file) <module name="suppressioncommentfilter"> <property name="offcommentformat" value="check\:off\: ([\w\|]+)"/> <property name="oncommentformat" value="check\:on\: ([\w\|]+)"/> <property name="checkformat" value="$1"/> </module> now required lines, can like //check:off: magicnumber datetime datetime = new datetime(2013, 2, 27, 23, 0): datetime.plushours(57); //check:on: magicnumber this suppress magicnumber checks , rest checks work here. you can su...
Read more