git branch - Git - switch local branches various scenario -


git powerful tool helps boost productivity. say, great power comes great responsibility, don't want mess while being more productive using git. need have strategies while using git version control. following few scenario while using local branches. can someone, please, explain how can deal those: , b local branches x remote branch

1.a pulled x, made changes. not staged,not committed,not pushed. how switch branch b without discarding changes of not including them in b

2.a pulled x, made changes.few unstaged(yes/no), staged changes,not committed,not pushed. how switch branch b without discarding changes of not including them in b

3.a pulled x, made changes.few unstaged(yes/no), staged changes,committed changes,not pushed. how switch branch b without discarding changes of not including them in b

4.a pulled x, made changes. want keep copy of these changes , want work simultaneously on other 2 features on top of changes in (the reason i'm working on multiple features simultaneously because might waiting hear further approach in feature , dont wanna waste time)

5.a pulled x, made changes. pushed remote. want older version without these changes go approach same feature.two sub scenario here: a)no changes have been pushed after pulled x , before pushed remote. b)someone pushed new code after pulled x , before pushed remote.

it might true few cases have same solution , few cases might moot/invalid m posting them sake of understanding why moot/invalid , sake completeness. on high level i'm trying understand behavior of stash,staging commit , have handy reference instead of spending dev hours juggling git can work on different features @ point of time. prefer not create new workspace(eclipse)/working directory(git) part of solution.

here answers:

  1. there 2 general strategies switching branch while working directory not clean. first (and conceptually easiest) option git stash on branch a. place changes (staged and unstaged) since last commit stash object can applied later. second option git commit. although seems second option violates question, bare me moment. when return branch @ later time, can continue working , commit new changes using git commit --amend. history of clean in won't have separate commit earlier changes.

    1. and 4. see answer 1 above.

  3. if want work on earlier commit, can checkout earlier commit. typically want create new branch in scenario, command git checkout <sha-1> -b newa, sha-1 hash of earlier commit, trick. regard 2 sub-cases, won't matter whether else pushes new changes head of on remote or not. reason new branch newa (based on earlier commit of a) rewrite of history. way ever able push new branch remote doing git push --force.

as @cjm628 mentioned, should spend time reading git documentation, answer give starting point.


-

Popular posts from this blog

c# - ODP.NET Oracle.ManagedDataAccess causes ORA-12537 network session end of file -

overview i want replace oracle.dataaccess orcale. managed dataaccess, opening connection latter throws ora-12537 network session end of file exception. exception message / stack trace {oracleinternal.network.networkexception (0x000030f9): ora-12537 : netzwerksession: dateiende @ oracleinternal.network.readerstream.read(orabuf ob) @ oracleinternal.ttc.orabufreader.getdatafromnetwork() @ oracleinternal.ttc.orabufreader.read(boolean bignoredata) @ oracleinternal.ttc.marshallingengine.unmarshalub1(boolean bignoredata) @ oracleinternal.ttc.ttcprotocolnegotiation.readresponse()} i trying connect oracle 11g database , not have client installed on local machine. working test application (unmanaged) using oracle.dataaccess works fine . using system; using oracle.dataaccess.client; namespace app.odp.unmanaged { internal class program { private static void main(string[] args) { //dummy connection string...
Read more

matlab - Compression and Decompression of ECG Signal using HUFFMAN ALGORITHM -

i want compress , decompress ecg signal stored text message text file , find out file size, cr,prd ratio,and qs. here code compression , decompression of ecg signal using huffman algorithm. i'm trying find out file size, compression ratio,prd ratio,qs. but error i'm getting the ecg file in text format. %clearing variables , screen enter code here clear all; close all; clc; [file1]=uigetfile('*.txt'); %fprintf('enter ecg file name :%s',file1); p=file1; t=sprintf('%s',p); b1=dlmread([file1]); len=length(b1); lead=input('enter lead number :'); %lead=str2double(lead); col2=b1(1:end,lead); e=fix(sqrt(len)); m=1; i=1:e j=1:e g2(i,j)=fix(col2(m)*1000); %amplifying 1000 m=m+1; end end g3=g2; i=1:e j=1:e ...
Read more

utf 8 - split utf-8 string into bytes in python -

i trying split utf-8 string bytes in python 3. problem is, when use bytearray, byte, encode etc functions array size of element 14 bytes, not 1 byte expected. need split text file sequence of bytes , send them byte after byte using sockets. tried this: infile = open (file, "r") str = infile.read() byte_str = bytes(str, 'utf-8') print("size of byte_str",sys.getsizeof(byte_str[0])) print gives me 14, need 1... suggestion? quoting official documentation : sys.getsizeof(object[, default]) return size of object in bytes. object can type of object. built-in objects return correct results, not have hold true third-party extensions implementation specific. only memory consumption directly attributed object accounted for, not memory consumption of objects refers to. if given, default returned if object not provide means retrieve size. otherwise typeerror raised. getsizeof() calls object’s __sizeof__ method , adds ...
Read more