git flow - Demystify this git log graph -


please me understand why git log shows additional purple line merge develop branch.

we use gitflow blue line represents commits directly develop. yellow line master branch merge in releases. other lines releases or hotfixes.

in scenario bright green line hotfix created off of master branch. there 1 commit on hotfix branch , "finished" (i.e. merged develop , master). commit merge in master makes sense me since see bright green line merge yellow (master) line. doesn't make sense me introduction of pink line shows merge of hotfix branch develop branch. expect bright green line terminate blue line. graph makes develop branched @ "throw exception" commit when wasn't.

git log looks similar (there dark blue line in there that's hard see).

enter image description here

i have theory wanted confirmed. when committed change "added raygun integration" locally, there outstanding change hadn't fetched , merged in origin (the hot fix integration). think pink line shows diverge because "added raygun integation" commit before merged hot fix commit. develop branch reintegrated when merged origin local , pushed. if case, if had pulled outstanding commit origin first, committed change, "merge branch 'hotfix/2.5.1' commit show merging blue line?

your theory correct. there's not else add except in git, word "branch" ambiguous: there branch names develop, master, , hotfix/2.5.1, , there branching , merging lines drawing commit graph. branch name identifies particular commit being "the tip commit branch", commit may on number of other branches well. merge adds new commit draws lines @ least 2 existing commits.

these automated graph-drawers allocate new color secondary merge lines. is, pick 1 side of merge (the "first parent" side) "main" line , keep color going previous commits, use different color other side. since there's merge in there, color.


Comments

Post a Comment

Popular posts from this blog

authentication - Mongodb revoke acccess to connect test database -

i have ec2 instance mongodb 3.2.0 installed. have user admin access. can connect user , perform operation remotely. 1 can connect database test remote if knows ip mongo 11.11.11.11. although not able make operations, want restrict access user credentials can connect server. first need create users , grant roles users, example: use admin db.createuser( { user: "myuseradmin", pwd: "abc123", roles: [ { role: "useradminanydatabase", db: "admin" } ] } ) then need start server --auth parameter mongod --auth more information here
Read more

r - Update two sets of radiobuttons reactively - shiny -

i have read ( how make choices in radiobuttons reactive in shiny? ) shows me how update radiobutton s in reactive way. however, when try , update 2 sets of buttons same data, 1 set renders. example: server: # create example data wafer <- rep(c(1:3), each=3) length <- c(1,1,2,1,1,1,3,5,1) width <- c(3,1,6,1,1,1,1,1,6) dd <- data.frame(wafer, length, width) shinyserver(function(input, output, session){ # create reactive dataframe store data values <- reactivevalues() values$df <- data.frame() # lengths , widths of wafer user input <- eventreactive(input$do, { subset(dd, wafer %in% input$wafer, select = length:width) }) # update reactive data frame lengths , widths have been selected user input observe({ if(!is.null(a())) { values$df <- rbind(isolate(values$df), a()) } }) output$wl <- renderdatatable({ a() }) # update radio buttons unique length , widths stored in values$df # ever "observe" put first in co...
Read more

ios - Realm over CoreData should I use NSFetchedResultController or a Dictionary? -

i'm working on app using core data , nsfetchedresultcontroller many reasons switch use realm. saw there "realm version" of nsfetchedresultcontroller on github wouldn't compatible current code using core data. the view controller displaying list of people same school, address book. list sublist of people studied in same city. so thinking make 1 unique request database retrieve list of people , filter locally list within 1 dictionary per school [string: anyobject] string section name within tableview , anyobject array of people. first solution, make nsfetchedresultcontroller each school predicate filtering location. delete actions etc.. handled delegates -> not compatible realm create dictionaries , update them each actions... -> works realm it's annoying code. any better solution? edit: i need clarify request: i'd write class inherit uitableviewcontroller. this class has list of people sorted in alphabetical order the tableview has ...
Read more