merge - Git --no-merged with --squash -


i prefer merge feature branches --squash lets me track when features added, , complete features need bisect on. find gives nice representation of state of stable branch on time.

however, when using --squash branches merged appear under --no-merged instead of under --merged. makes difficult keep track of state of each branch (i.e. when finished). not want delete 'finished' branches has happened have had check them out bisect further , other reasons (sometimes problem requires multiple paths of attack until solved, , have found valuable have documented).

it there way either:

  • have --merged , --no-merged recognise squashed branches have in fact been merged.

or

  • archive merged (squashed) branches in sense not appear in either listing, still available if need them.

i prefer second solution if possible. there quite few non-current branches accumulating , hiding them make easier search list current branch looking for.

branches merged, if—and if—another branch has them direct or indirect parent (i.e. when following parents of commits, @ time reach branch). there no exceptions this.

when squash changes, creating new commit object contains changes 1 branch @ once. have “new branch” 1 commit, , old branch stays around keep original commits available. when merge, merge 1 commit, one’s branch gets merged.

so no, when squash changes, original branch still contains individual commits won’t recognized merged, because isn’t merged. there no way change behavior, or “archive” branch. thing create tag branch instead, marker, can delete branch itself.

however, proper way merge full branch. if saying want original branch “still available if [you] need them”. if want that, should keep original branch inside history, it’s real part of history.

if worry readability of history, should consider making non-fast-forward merges time, branches merge in appear separately on side.


Comments

Post a Comment

Popular posts from this blog

android - Get AccessToken using signpost OAuth without opening a browser (Two legged Oauth) -

i using signpost oauth access data magento server. have read various tutorials on same , reach point open browser user can enter credentials. however, per requirement have automate part. hence, user should not browser page. have set-up done on server side ( magento ), hit url , returned call page. same through program in android. i have tried below, consumer = new commonshttpoauthconsumer(key, secret); provider = new commonshttpoauthprovider(oauth_init_url,access_token_url, authorize_url); try { provider.retrieverequesttoken(consumer, oauth.out_of_band); log.d("tokens" , consumer.gettoken() + " -- " + consumer.gettokensecret()); } and request tokens. dont know how bypass next step. tried directly accessing accesstoken (stupid of me) provider.retrieveaccesstoken(consumer, "mycallback://callback"); no luck, ends in oauth.signpost.exception.oauthnotauthorizedexception: authorization failed (server replied 401). ...
Read more

org.mockito.exceptions.misusing.InvalidUseOfMatchersException: mockito -

getting error org.mockito.exceptions.misusing.invaliduseofmatchersexception: invalid use of argument matchers! 1 matchers expected, 2 recorded. exception may occur if matchers combined raw values: //incorrect: somemethod(anyobject(), "raw string"); when using matchers, arguments have provided matchers. example: //correct: somemethod(anyobject(), eq("string matcher")); at when( getprogramservice .callservice(any(getprogramtype.class))) .thenreturn(jaxbresponse); please explain error , possible resolution the code posted looks fine; don't see problem it. code before or above causing exception. key here: invalid use of argument matchers! 1 matchers expected, 2 recorded. any , used above, doesn't return "special kind of null" or "special kind of getprogramtype"; don't exist. instead, returns null , side effect puts matcher on stack. whe...
Read more

google shop client API returns 400 bad request error while adding an item -

i'm working on solution add items in google shopping market java application. following tutorial real mess because of missing classes of laste release, after setting 1.5-beta maven managed make base example typecheck correctly classes. still can make simple task of adding 1 item. instead of posting whole code i'm posting part creates product feed. private product createproduct(string id) { product product = new product(); product.title = "red wool sweater"; product.content = new content( "text", "comfortable , soft, sweater keep warm on " + "cold winter nights. red , blue stripes."); product.appcontrol = new appcontrol(); product.appcontrol.addrequireddestination("productads"); product.externalid = id; product.lang = "it"; product.country = "it"; product.condition = "nuovo"; product.price = new price("eu...
Read more