version control - Delete a pushed old git commit -

-

we working on single branch 20 developers. yesterday accidentally messed auto merge commit.

he had pull taken 24 hours(span-1) before committing. after committing , taking pull accidentally reverted files shown in auto merge commit believing shouldn't committed had not changed files. after committed auto merge , pushed it. after 24 hours(span-2) of push recognized issue.

now problem is, in span-1 have around 25 commits 10 developers , similar in span-2. changes on same/different files same/different developers.

we tried cherry picking asks conflict resolution not possible in our case many developers involved.

is there way solve problem. want delete merge commit. if required can delete actual commit done developer between span-1 , span-2. having these changes in history not problem. want clean repository.

note: question here doesn't address specific problem. general question on deleting git commits. not interested in deleting/rewriting history. want rolled changes due bad merge available on remote repository without having resolve merge conflicts

is there way solve problem.
want delete merge commit

reset

  # reset branch given commit   git reset head <sha-1>    # push branch -f flag = rebase   #    # dangerous, rebase.    # developers have re-clone project   git push -f origin <branch>

revert (create commit reverse patch)

this way don't rewrite history.

on other hand, if you've published work, don't want reset branch, since that's rewriting history.

in case, indeed revert commits.

# create x separate revert commits  # (undo original commit changes) # if revert merge have supply parent number `-m` git revert <sha1> <sha1> <sha1> ...  # takes ranges. revert last 2 commits: git revert head~x..head~y  # reverting merge commit git revert -m 1 <merge_commit_sha>

the git-revert manpage covers lot of in description.
useful link this git-scm.com blog post discussing git-revert.

if decide didn't want revert after all, can revert revert (as described here) or reset before revert (see previous section).

git filter-branch

lets rewrite git revision history rewriting branches mentioned in , applying custom filters on each revision.

those filters can modify each tree (e.g. removing file or running perl rewrite on files) or information each commit. otherwise, information (including original commit times or merge information) preserved.


Comments

Post a Comment

Popular posts from this blog

ruby - Trying to change last to "x"s to 23 -

-
i have been playing around irb , have string looks this: irb(main):072:0> puts ["[\"4354 5432 5432 xxxxx\", \"6547 6547 8543 xxxxx\", \"2344 6543 6674 xxxxx\", \"2346 6236 7543 xxxxx\", \"1273 5585 5587 xxxxx\"]"] => nil irb(main):073:0> what want gsub last 2 "x" s of each 17 digit combination, 23 . what i've tried far (i've been using rubular): a.gsub(/\d[x]/,"23") <= grabs "x" s i'm close a.gsub(/\w[x{2}]/,"23") <= grabs "x" s grabs two digits each combination. is there easier way i'm not understanding? a.gsub(/\d{4} \d{4} \d{4} xxx\kxx/, '23') \d{4} = 4 digits what \k drop matched far. can use don't replace entire number, still able validate have in desired format.
Read more

jquery - Clone last and append item to closest class -

-
this bare-bones code on page: <div class="list-container"> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> </div> <p><button class="add-list-item">add</button></p> <div class="list-container"> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> </div> <p><button class="add-list-item">add</button></p> <di
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