Merge local master branch with remote master branch in Git -


i'm in strange situation: have copied directory (local repository) former developer on machine. there have been several commits remote master not in local repository.

how merge local copy of master up-to-date changes of remote master?

case 1: remote/master has local master has

if remote/master contains of commits local master contains, git pull:

git checkout master git pull remote master

you can check if local master has commits remote/master doesn't using following:

git fetch remote git log --oneline --graph remote/master..master

that show commits contained in master not in remote/master. if don't see output, means remote/master has local master has.

case 2: local master has commits remote/master doesn't have

if local master contains commits remote/master doesn't contain, you'll have figure out how want handle that. want keep them , merge them remote/master, or want throw them away?

case 2a: merge/rebase local master commits remote/master

if want keep them, can either merge or rebase local master remote/master:

git checkout master git fetch <remote>  # merge remote/master git merge remote/master  # or rebase local commits on top instead git rebase remote/master  # push results git push remote master

case 2b: throw away local master commits

if don't want keep local commits, hard reset of local master same point remote/master:

git checkout master git fetch remote git reset --hard remote/master

documentation

you can read more of these commands git documentation. highly recommend excellent free online pro git book, chapters 1-3 , 6-6.5.


Comments

Post a Comment

Popular posts from this blog

image - ClassNotFoundException when add a prebuilt apk into system.img in android -

i'm in trouble add prebuilt apk system.img based taiwan mtk android phone platform, when push apk onto device,after reboot phone,the apk can installed succecessfully,but if add apk alps/out/target/product/$prj/system/app or vendor/mediatek/$prj/artifacts/out/target/product/$prj/system/app ,and produce system.img,the apk can't installed normally,the logcat say: a.lang.runtimeexception: unable instantiate activity componentinfo{com.sec.android.widgetapp.ap.hero.accuweather.widget/com.sec.android.widgetapp.ap.hero.accuweather.widget.weatherclock}: java.lang.classnotfoundexception: com.sec.android.widgetapp.ap.hero.accuweather.widget.weatherclock. can tell me what's problem ? when package manager installs apps part of system partition different installing apps on data partition. looks app using libraries somewhere else. when install on data lib directory created in apps data directory , symlinked /data/app-lib/. when apps installed on system it's expecte...
Read more

I need to import mysql 5.1 to 5.5? -

i have mysql 5.1 database , need import localhost running 5.5. how import 5.5 or downgrade mysql? install phpmyadmin 5.1 os: http://www.wikihow.com/install-phpmyadmin-on-your-windows-pc or https://www.digitalocean.com/community/articles/how-to-install-and-secure-phpmyadmin-on-ubuntu-12-04 then login, click on database, hit export, , export in sql format (quick fine). import .sql file 5.5 server (after installing phpmyadmin) logging in clicking database , hit import. hope helps!
Read more

Java, Hibernate, MySQL - store UTC date-time -

i saw here on few related questions (like this one , of course, this one )... essentially, want store date-time utc, , let application user choose time zone wants display date-time in. since seems date-time fields affected underlying jdbc driver, wonder if acceptable way go storing utc date-time: set both mysql , application server machine utc time zone (no need separate) both mysql , jvm should pick underlying system time settings (if not instructed otherwise) use datetime table columns on mysql side use java.util.date corresponding mapping on hibernate side (i guess java.sql.timestamp used too) let application worry interpreting date-time fields - i.e. let user choose preferred time zone is ok? edit clarify - here meant refer timestamps created strictly on server (e.g.date-time of record creation). application server instantiates date objects (new date() equals current date-time on server, , time zone agnostic). if client user wants supply date searching/filte...
Read more