Git: move a branch to make it point to another -

-

i had following situation:

-----o      |    master    branch1

then had make changes master:

 -----o-----o-----o       |           |    branch1      master

now want branch1 @ same point of master (and therefore contain commits made):

-----o-----o-----o                  |                master                branch1

i don't know if merge correct way achieve this. steps should take?

edit: consider have uncommitted changes should committed on branch1 after branch1 date master. need current changes left untouched committed later on branch1

since branch1 references commit ancestor of master, merge operation won't result in merge commit; instead, git move branch1 reference forward references same commit master. called fast-forward merge.

from documentation:

when try merge 1 commit commit can reached following first commit’s history, git simplifies things moving pointer forward because there no divergent work merge – called “fast-forward.”

so, in case, can say:

git checkout branch1 git merge master

which make branch1 point same commit master.

update: note need have clean working directory before doing merge. if have uncommitted changes in branch1 (i.e. have dirty working directory), should first store them away in stash using git-stash command:

git stash save --include-untracked -m "work in progress"

once changes saved , working directory clean, can proceed merge. afterwards, can restore files stash saying:

git stash pop

which put files in working directory , remove them stash. @ point, can choose commit them in numbers of commits.


Comments

Post a Comment

Popular posts from this blog

Spring Boot + JPA + Hibernate: Unable to locate persister -

-
i trying work entity inside request method of spring boot application. entity in project , pom.xml has dependencies it. why error message?: org.hibernate.unknownentitytypeexception: unable locate persister: com.ric.bill.model.bs.par package com.ric.web; import java.util.concurrent.atomic.atomiclong; import javax.persistence.entitymanager; import javax.persistence.persistencecontext; import net.sf.ehcache.cachemanager; import net.sf.ehcache.management.cache; import net.sf.ehcache.management.cachestatistics; import org.hibernate.stat.statistics; import org.springframework.beans.factory.annotation.autowired; import org.springframework.boot.autoconfigure.domain.entityscan; import org.springframework.cache.annotation.enablecaching; import org.springframework.transaction.annotation.enabletransactionmanagement; import org.springframework.transaction.annotation.propagation; import org.springframework.transaction.annotation.transactional; import org.springframework.web.bind.annotati...
Read more

go - Golang: panic: runtime error: invalid memory address or nil pointer dereference using bufio.Scanner -

-
i implementing go program uses bufio.scanner , bufio.writer have packaged code follows package main import ( "fmt" "player/command" "strings" ) func main() { //enter code here. read input stdin. print output stdout commands.scanner.scan() { //scan new line , send comand variable check command exist or not input := strings.split(strings.trim(commands.scanner.text(), " "), " ") command := input[0] if command == "" { fmt.printf("$ %s:", commands.pwd) continue } if !commands.commands[command] { commands.throwerror("cannot recognize input.") } else { commands.execute(command, input[1:], nil) } fmt.printf("$ %s:", commands.pwd) } } i using init.go file in main package follows package main import ( "flag" "player/sourc...
Read more

c - double free or corruption (fasttop) -

-
this code reads null terminated string file (file containing null terminated strings & should provide index wanted string). error: *** error in `./main': double free or corruption (fasttop): 0x090a4a80 *** aborted code: char *tmp_realloc=null; char *sstring=null; int i=1; /*set file pointer point string*/ fseek(fh,index,seek_set); sstring=(char*)malloc(sizeof(char)); if(sstring == null) return null; tmp_realloc=sstring; while( (*(sstring+i-1)=(char)fgetc((file*)fh)) != 0x0 ) { /*reallocate more memory*/ tmp_realloc=(char*)realloc((char*)sstring,++i); /*if not same address copy old new & set old point new*/ if(tmp_realloc != sstring){ strcpy((char*)tmp_realloc,(char*)sstring); free(sstring); sstring=tmp_realloc; } } could tell me pointer causing issue (& reason) ? remove part /*if not same address copy old new & set old point new*/ if(tmp_realloc != sstring){ strc...
Read more