I thought that "git pull" includes merge, seems not, what am not understanding? -

-

i have 2 branches sw-dev , make. have file variables.mk changed locally in make branch. in meantime, file changed in origin sw-dev repository include line blk := pl/blocks. when 

>git pull origin sw-dev

i expect there either silent or conflict merge. no, nothing happens, date. missing??

>git checkout origin/sw-dev head @ 4f391d3... merge branch 'sw-dev' of ssh://(...)/tools/git/xdk sw-dev >grep blk variables.mk blk := pl/blocks >git checkout make switched branch 'make' >git pull origin sw-dev /tools/git/xdk * branch            sw-dev     -> fetch_head up-to-date. >grep blk variables.mk >git status variables.mk # on branch make nothing commit, working directory clean

you not missing anything, pull fetch branch , merges current one. telling branch make contains commit hashes in origin/sw-dev. have had include commit 4f391d3 make branch @ point.

do git log in make , hash 4f391d3 verify it.

do git reflog check last commands executed , see when did .


Comments

Post a Comment

Popular posts from this blog

python - Subclassed QStyledItemDelegate ignores Stylesheet -

-
i'm trying subclass qstyleditemdelegate remove focus rectangle in qcombobox . even though i'm calling base implementation of paint function , nothing else, result different. looks if parts of style-sheet influence bounding box of item taken consideration. class pstyleditemdelegate(qstyleditemdelegate): def __init__(self, *args, **kwds): super(pstyleditemdelegate, self).__init__(*args, **kwds) def paint(self, *args, **kwargs): qstyleditemdelegate.paint(*args, **kwargs) what have paint unmodified qstyleditemdelegate ? as suggested tried replacing pyside pyqt4 , works, appears bug. update pyside 1.1.2 1.2.1 result same. unfortunately switch breaks other parts of code, if there no other suggestions i'm going accept answer. edit bug tracked here
Read more

java - HttpClient 3.1 Connection pooling vs HttpClient 4.3.2 -

-
i have used httpclient3.1(java) connection pooling below : import org.apache.commons.httpclient.httpclient; import org.apache.commons.httpclient.multithreadedhttpconnectionmanager; import org.apache.commons.httpclient.params.httpclientparams; import org.apache.commons.httpclient.params.httpmethodparams; import org.apache.log4j.logger; public class httpclientmanager { private static logger logger = logger.getlogger(httpclientmanager.class); private static multithreadedhttpconnectionmanager connectionmanager = new multithreadedhttpconnectionmanager(); private static httpclientparams clientparams = new httpclientparams(); static { try { clientparams.makelenient(); clientparams.setauthenticationpreemptive(false); clientparams.setparameter(httpmethodparams.so_timeout, new integer(30000)); // set so_timeout clientparams.setparameter(httpmethodparams.head_body_check_timeout, new integer(3000)); // head responses
Read more

SQL: Divide the sum of values in one table with the count of rows in another -

-
is possible to, in single query, sum bunch of values in 1 table, , divide count of rows in another? there common id/key in both tables... fyi, win points least info provided in question. answer it's possible...here psuedo code since i'm guessing @ tables , columns select summing / counting whynot (select id, sum(whatever) summing where_ever ) inner join (select id, count(1) counting what_ever)b on a.id = b.id question = 'vague' group a.id
Read more