msysgit - How should I keep my git project branch up to date with master? -

-

let's have master branch , project branch, both on our remote origin. work being done in project branch, bug fix needs go master can deployed immediately. when project done, want able squash commits in project single commit , merge master.

usually feature branches (that not pushed origin), keep them date merely rebasing master , going on our merry way, because project own branch on origin, i'm not sure how keep history way want (commits master, new project commits, no merge commits ideally) due safeguards rewriting history on remote branches. deleting remote project , recreating correct history, suboptimal.

i'm okay rewriting history on remote project because team of 2 , understand implications , willing ridiculously careful. how accomplish it?

you can merge braches in git

git checkout project  git merge origin/master

that merge changes master has project, long came same ancestor.


Comments

Post a Comment

Popular posts from this blog

sql server - python to mssql encoding problem -

-
Image
greetings by using pymssql library, want write data mssql database encounter encoding issues. here sample code write db: # -*- coding: utf-8 -*- import _mssql .... connection info data here .... def mssql_connect(): return _mssql.connect(server=host, user=username, password=pass, database=db, charset="utf-8") con = mssql_connect() insert_ex_sql = "insert mydatabsae (id, programname, programdetail) values (1, 'test characters ÜŞiçÇÖö', 'löşüiiğĞü');" con.execute_non_query(insert_ex_sql) con.close() sadly data written db corrupted: the collacation of mssql db is: turkish_ci_as how can solved? here possible solution : the key insert_ex_sq.encode('your language encoder') . try instead: con.execute_non_query(insert_ex_sq.encode('your language encoder'))
Read more

java - SNMP4J General Variable Binding Error -

-
i trying use snmp4j snmp bulkget. when ever use snmp4j make call returned responseevent error says "general variable binding error" , data returned equal null. to debug: print out, console, exact oid , version number using in snmp4j. use printed out data snmpwalk on command line. valid results. know sending snmp4j correct pdu correct oid, version number, max repititions, etc. i have used snmp4j , code wrote succesffuly monitor other devices years. don't know different time. leaving me stumped. why "general variable binding error?" causes error? ideas debug? can reproduced? if so, first action should using wireshark or microsoft network monitor capture network packets. my guess agent gives generr response, not surprising, http://www.ietf.org/rfc/rfc1157.txt
Read more

c# - BasicHttpBinding equivalent CustomBinding using WCF Client and PHP WebService -

-
i running visual studio 2008 unit test c# webservice php using wcf , received following error: system.servicemodel.security.messagesecurityexception: http request unauthorized client authentication scheme 'anonymous'. authentication header received server 'ntlm,basic realm="(null)"'. ---> system.net.webexception: remote server returned error: (401) unauthorized.. i using windows xp sp3 machine, unit test vs 2008 , wcf connect php webservice. i have no control php webservice. cannot modify (neither configuration security). here config file client use webservice php: <system.servicemodel> <extensions> <bindingelementextensions> <add name="customtextmessageencoding" type="company.integracioneasyvista.customtextencoder.customtextmessageencodingelement,company.integracioneasyvista.customtextencoder, version=1.0.0.0, culture=neutral, publickeytoken=9744987c0853...
Read more