Git: continue repository history from previous commit -


let's master branch of repository looks this:

* commit 75e259944814a102d6362eaf42fd4ff09d839865 | |       bad commit | * commit 0307a5c4e623c584898c44d243a50bb02c91aa9e | |       commit 1. | * commit 98ef0e69e3e5cd51ff5e24c1df616703272c5a79 | |       commit 1. |

the bad commit has been pushed central repository , distributed. want continue history last commit. when done, history like

* commit 0626f793ff7ba847e7663fe88de6c6a2d597dc73 |  |       continuing development. |  | * commit 75e259944814a102d6362eaf42fd4ff09d839865 | |  | |     bad commit | | | |      | | * | commit 0307a5c4e623c584898c44d243a50bb02c91aa9e |/  |       commit 2. | |        | * commit 98ef0e69e3e5cd51ff5e24c1df616703272c5a79 | |       commit 1. |

that is, development continues last "good" commit. can safely achieve though "bad" commit has been distributed among developers?

if reset current branch last commit git reset --hard , make new commits , push again, you'll changing history out under coworkers who've started working on top of bad commit. small, local team know they're doing in git, may not big deal. can warn front, make change , push it, tell them adjust locally. can bit of pain if people have made feature branches , merges after bad commit, though. they'll end having reset things around, remake merges, etc.

you start new branch @ last commit, won't remove bad commit history of current branch, it's not helpful.

what want in situations git revert bad commit, makes new commit reverse of bad commit. won't change anyone's history. it'll add new commit fixes issue. have @ git revert details. it's simple.


Comments

Post a Comment

Popular posts from this blog

c++ - CryptStringToBinary API behavior -

i seeing strange behavior cryptstringtobinary cryptography api. please see below code (config: x64 debug): #include "stdafx.h" #include <windows.h> #include <strsafe.h> #include <iostream> #include <exception> void main() { dword dwskip; dword dwflags; dword dwdatalen; //lpcwstr pszinput = l"jaaaaaecaaadzgaaakqaagdnnl1l56bwgfjdgr3rpxtqqqn6daw3usv2emkjym4t"; //this works fine lpcwstr pszinput = l"mytest"; //doesnt work, api returns false,error code 0x0000000d // determine size of byte array , allocate memory. if(! cryptstringtobinary( pszinput, _tcslen( pszinput ) + 1, crypt_string_base64, null, &dwdatalen, &dwskip, &dwflags ) ) { dword dw = getlasterror(); //0x0000000d: data invalid throw std::exception( "error computing byte length." ); } byte *pbytebyte = null; try { ...
Read more

java.util.scanner - How to read and add only numbers to array from a text file -

i'm learning java , have question regarding reading file want read numbers file contains strings well. here example of file: 66.56 "3 java 3-43 5-42 2.1 1 and here coding: public class test { public static void main (string [] args){ if (0 < args.length) { file x = new file(args[0]); try{ scanner in = new scanner( new fileinputstream(x)); arraylist<double> test = new arraylist<>(); while(in.hasnext()){ if(in.hasnextdouble()){ double f=in.nextdouble(); test.add(f);} else {in.next();} } catch(ioexception e) { system.err.println("exception during reading: " + e); } } my problem add 66.56,2.1 , 1 doesn't add 3 after "3 or ignores 3-43 , 5-42 can tell me how skip strings , add doubles here? thanks all said 3 ie; "3, 3-43 , 4-42 strings either u read string , split , check number @ " , - or put in space between characters , integers. jvm after compilation tre...
Read more

iphone - Three second countdown in cocos2d -

i trying have 3 second countdown display when level beat in game. did: -(void) gamesegmentbeat { [self pauseschedulerandactions]; // overlay game opaque background ccsprite *opaquebg = [ccsprite spritewithfile:@"background1.png"]; opaquebg.position = screencenter; [self addchild:opaquebg z:10000]; // these 3 labels 3 seconds cclabelttf *three = [cclabelttf labelwithstring:@"3" fontname:@"helvetica" fontsize:100]; three.position = ccp(screencenter.x, screencenter.y); cclabelttf *two = [cclabelttf labelwithstring:@"2" fontname:@"helvetica" fontsize:100]; two.position = ccp(screencenter.x, screencenter.y); cclabelttf *one = [cclabelttf labelwithstring:@"1" fontname:@"helvetica" fontsize:100]; one.position = ccp(screencenter.x, screencenter.y); // secondspast specified in update method secondspast = 0; if (secondspast == 1) { [self addchild:thr...
Read more