In this blog we were\u00a0going to discuss some “Feature branching and it’s repeated sync” disorder\u00a0and it’s cure using git “rerere” to keep the sanctity of git BPF – Branch Per Feature.<\/p>\n
First of all, I would like to discuss benefits of git BPF\u00a0and how we miss use it and fall in trap of “Feature branching and it’s repeated sync” disorder.<\/em><\/p>\n Some Benefits of using Git BPF :<\/strong><\/em><\/span><\/p>\n There might be many more….<\/p>\n Problem we face using Git BPF<\/strong> related to\u00a0“Feature branching and it’s repeated sync” disorder\u00a0syndrome<\/strong> :<\/span><\/em><\/p>\n When 2 devs are\u00a0working on the same chunk\/part of code\u00a0over\u00a0different features branches and when they try to perform\u00a0merge, it will be obvious for them to\u00a0get the conflict over code. If feature branch is long-lived branch then they can expect a huge list of conflicts to resolve.<\/p>\n To avoid that pain we mostly fall in the trap of the disorder\u00a0named “Feature branching and it’s repeated sync”<\/em>. \u00a0You will start doing frequent pull of develop branch over your feature branch to remain in sync.<\/p>\n Drawback of syndrome :<\/span><\/em><\/strong><\/p>\n It obviate\u00a0the purpose and major goal of BPF i.e. to keep the history more readable and understandable as we kept merging master\/develop into feature branch.<\/p>\n To avoid disorder, we should not commit any changes we pulled from develop branch over feature branch for the purpose of testing the stability of our feature branch. It will\u00a0led us to trap of resolving the same conflict every-time we take pull and after testing resetting branch to feature branch\u00a0state which is rather more painful and time consuming majorly in long-lived branch.<\/p>\n Cure :<\/strong><\/span><\/em>\u00a0 We need to visit and understand about cure from Git Specialist, Dr. ReReRe (Re<\/strong>use Re<\/strong>corded Re<\/strong>solution) :<\/p>\n To enable “ReReRe” over git, we need to do the following :<\/p>\n Understanding\u00a0enchanting \u00a0“ReReRe”:<\/span><\/strong><\/em><\/p>\n For example :<\/em>\u00a0 We have a develop branch having\u00a0file named sql.properties<\/p>\n We created feature branch from it named “feature\/configureDatabase” :<\/p>\n Some other person perform the same change over branch “feature\/devDatabaseConfiguration” setting :<\/p>\n and merge it back to develop.<\/p>\n Now when I am going to take pull of develop branch over\u00a0“feature\/configureDatabase” will led me to conflict. I will resolve the conflict test the changes with it. After stability and testing I need to revert them back to keep sanctity of feature branch commits dedicated to it only.<\/p>\n Using ReReRe is simple :\u00a0<\/span><\/p>\n Create throw-away branch from develop, for example : rerereDbConfigTest<\/p>\n Now checkout\u00a0rerereDbConfigTest and merge your feature branch “feature\/configureDatabase” to “rerereDbConfigTest” which will led to conflict. Resolve the conflict and run command :<\/p>\n As you can see rerere recorded the conflict resolution for file “sql.properties”.<\/p>\n Now do git reset –hard over it. As your resolution is already recorded in .git\/rr-cache<\/p>\n Now whenever you do merge to develop branch, it will give you Conflict but with resolution :<\/span><\/p>\n Highlighted line above\u00a0shows, you have staged resolution of this conflict. \u00a0All you need to do is run this command to resolve conflict as per resolution recorded previously by rerere :<\/p>\n Your file will get the resolution from the .git\/rr-cache file and conflict will get resolved from recorded cache after running above command.<\/p>\n Now you just need to commit\/push your changes\u00a0over develop, no manual conflict resolution.<\/p>\n It will save\u00a0your time in case of huge conflict resolution while you work on long-lived feature branches. And you can remove\u00a0or throw away “rerereDbConfigTest” after performing\u00a0testing and merging your feature branch to develop.\u00a0Make sure you don’t push throw away\u00a0branch to remote.<\/p>\n What we achieve :<\/p>\n Some references :<\/span><\/p>\n I came across this cool feature of git and thought to share with\u00a0our subscribers. Those who aren’t aware of git goodness, Hope it helps \ud83d\ude42<\/p>\n","protected":false},"excerpt":{"rendered":" In this blog we were\u00a0going to discuss some “Feature branching and it’s repeated sync” disorder\u00a0and it’s cure using git “rerere” to keep the sanctity of git BPF – Branch Per Feature. First of all, I would like to discuss benefits of git BPF\u00a0and how we miss use it and fall in trap of “Feature branching […]<\/p>\n","protected":false},"author":20,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"iawp_total_views":3},"categories":[1],"tags":[],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/www.tothenew.com\/blog\/wp-json\/wp\/v2\/posts\/24216"}],"collection":[{"href":"https:\/\/www.tothenew.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.tothenew.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.tothenew.com\/blog\/wp-json\/wp\/v2\/users\/20"}],"replies":[{"embeddable":true,"href":"https:\/\/www.tothenew.com\/blog\/wp-json\/wp\/v2\/comments?post=24216"}],"version-history":[{"count":0,"href":"https:\/\/www.tothenew.com\/blog\/wp-json\/wp\/v2\/posts\/24216\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.tothenew.com\/blog\/wp-json\/wp\/v2\/media?parent=24216"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.tothenew.com\/blog\/wp-json\/wp\/v2\/categories?post=24216"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.tothenew.com\/blog\/wp-json\/wp\/v2\/tags?post=24216"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}\n
git config --global rerere.enabled 1\r\ngit config --global rerere.autoupdate true<\/pre>\n
url=jdbc:mysql:\/\/localhost:3306\/\r\ndbName=rerere_dummy\r\nuserName=rerere_test\r\npassword=rerere_test\r\n<\/pre>\n
url=jdbc:mysql:\/\/localhost:3306\/test\r\ndbName=rerere_test\r\nuserName=rerere_test\r\npassword=rerere_test<\/pre>\n
url=jdbc:mysql:\/\/localhost:3306\/dev\r\ndbName=rerere_dev\r\nuserName=rerere_dev\r\npassword=rerere_dev<\/pre>\n
git rerere\r\n\r\nRecorded resolution for 'sql.properties'\r\n<\/strong><\/pre>\n
Auto-merging sql.properties\r\nCONFLICT (content): Merge conflict in sql.properties\r\nStaged 'sql.properties' using previous resolution.<\/strong>\r\nAutomatic merge failed; fix conflicts and then commit the result.\r\n<\/pre>\n
git rerere status sql.properties\r\n<\/pre>\n
\n
\n