floehopper + branch   57

Clean obsolete branches on your git repository safely
git  cherry  branch 
august 2015 by floehopper
"Branching is easy, merging is hard".
git  merge  branch  resolve  conflict  semantic  dvcs 
august 2011 by floehopper
Technology Radar July 2011 | www.thoughtworks.com
"Disappointingly, we continue to see development teams embrace the practice of feature branching to isolate work and defer integration. Feature branches commonly cause significant pain and unpredictability during late merges, but more importantly prevent the continual design improvement necessary to maintain high quality software. We recommend continuous integration and branch by abstraction as an alternative to feature branching."

"Charles Nutter and the JRuby team continue to improve JRuby at a frantic pace. It is fast and they place massive importance on keeping their ecosystem up-to-date, including DB adapters, gem management, and modern Rails deployment. Rails 3 + JRuby is an awesome platform. There really is no reason to not be using Ruby, one of our favorite languages, in the enterprise."
tw  feature  branch  continuous  integration  abstraction  isolation  jruby  ruby  enterprise 
august 2011 by floehopper
MF Bliki: FeatureToggle
Alternative to the more common feature branch.
feature  branch  toggle  switch  merge  rebase  continuous  integration 
november 2010 by floehopper
Twitter / @The Build Doctor: Branch by abstraction for ...
"Branch by abstraction for databases! Zero downtime releases! Brilliant! #devopsdays"
branch  abstraction  database 
october 2010 by floehopper
Branch By Abstraction
"The suggestion is that you can convene large sets of developers in a single trunk and avoid "short lived feature branches"".
branch  feature  abstraction  switch 
october 2010 by floehopper
jgeewax's git-feature
Another git workflow tool - alas it to is based on feature branches.
git  feature  branch  shell  command  line  script  workflow 
september 2010 by floehopper
Why aren't you using git-flow?
I remain unconvinced about features branches and the like, but having a standardised workflow does make sense.
git  workflow  feature  branch 
august 2010 by floehopper
Twitter / Mike Burrows: .@energizr @agilemanager @alshalloway
.@energizr @agilemanager @alshalloway and the smaller the increments the less the branch/merge/configuration waste (we mostly do without it)
tweet  small  increment  branch  merge  waste  wip 
august 2010 by floehopper
Introducing GitHub Compare View - GitHub
Interesting that this is supposed to be the first of a number of "Code Review" related features on GitHub.
github  code  review  comparison  view  tag  branch  revision 
march 2010 by floehopper
Introducing Git-Goggles
"A series of Git utilities to streamline working with remote branches and reviewing code".
git  goggles  remote  branch  status  code  review 
march 2010 by floehopper
nowells's git-goggles
"A series of GIT utilities to streamline working with remote branches and reviewing code".
git  branch  status  code  review 
march 2010 by floehopper
nvie's gitflow
"Git wrapper scripts to provide high-level repository operations for Vincent Driessen's branching model". I think that's the one with feature branches and release branches.
git  workflow  branch  feature  release 
january 2010 by floehopper
A successful Git branching model
I remain unconvinced about "feature" branches.
git  branch  workflow 
january 2010 by floehopper
There Is Only One Codebase
"One important step to take is to stop slicing the ‘resource pool’ and to start slicing the work in the right way. Obviously, arbitrary slicing of the work will not yield benefit; it has to be sliced in ways that result in deliverable pieces of functionality".
branch  merge  feature  bugfix  team  parallel 
december 2009 by floehopper
Code: Flickr Developer Blog » Flipping Out
Like Chris R, I'd prefer to do this than have so-called feature branches. Although, it sounds horrible, it has the benefit of making the costs of "branching" much more explicit. I'd also hope the feature differences could be accomplished using polymorphism and by wiring things up differently, as opposed to scattering conditional logic throughout the code.
tumblr  flickr  feature  branch  conditional  flag  code  explicit  cost  polymorphism 
december 2009 by floehopper
OSS Watch - Engaging Developers with Open Source Projects Workshop
"Why should software developers who create local customisations of open source software take the further step of submitting their changes back to the main project?" - Made me realise that not all developers understand what seems like a no-brainer to me.
open  source  branch  patch  customize  contribute 
september 2009 by floehopper
MF Bliki: FeatureBranch
Discusses the pros and cons of Feature Branches and the difference between Continuous Building, Promiscuous Integration & Continuous Integration.
dvcs  git  branch  feature  continuous  build  integration  promiscuous  vcs  merge 
september 2009 by floehopper
Martin Fowler tweet - branching strategies
"Experimenting with an article on branching strategies and why feature branching is different to Continuous Integration".
branch  strategy  continuous  integration  feature 
september 2009 by floehopper
Ruby on Rails Integration Testing with Integrity
This says that Integrity has specific support for building branches from a git repos.
continuous  integration  git  testing  branch  integrity 
april 2009 by floehopper
Some new git techniques for your arsenal
1. Looking at the changes between two branches
2. Figuring out what you’ve committed to your local repository but not yet pushed upstream
git  change  branch  diff  repository  local  push  commit  upstream 
march 2009 by floehopper
Git Status in Your Prompt
Adds the current branch name and its clean/dirty status to your shell command prompt.
referrer:threedaymonk  git  shell  branch  command  status  prompt 
february 2009 by floehopper
A tool to simplify working with remote branches.
git  ruby  branch  remote 
january 2009 by floehopper
Forking, Continued
Useful discussion about the problem of identifying the "master" repository for a project when lots of forking is going on with git & GitHub.
open  source  git  github  branch  repository  workflow  fork 
january 2009 by floehopper
Agile git and the story branch pattern
I'm not sold on the approach, but I agree if you are going to branch, then you *must* "merge early, merge often".
git  branch  merge  rebase 
january 2009 by floehopper
You can’t always git what you want
Branching is an evil for small teams. Single-trunk development with continuous, often, easy integration leads to fewer bugs, better communication between team members, sharper code.
git  tumblr  continuous  integration  branch  agile  trunk 
august 2008 by floehopper
William's miscellaneous git tools
My favourite is "git-wtf" which works out what the hell is going on with all your branches and merges!
git  branch  merge  tumblr 
august 2008 by floehopper
Git: working with branches
Not sure why you wouldn't integrate (merge) with master at every opportunity. Branches are a snare and a delusion.
git  branch  merge  continuous  integration 
july 2008 by floehopper
subversion: Subversion 1.5 Release Notes - Merge Tracking
# Reduce the bookkeeping overhead for branch maintenance
# Avoid common cases of the "repeated merge" problem
# Allow for cherry-picking of changes
subversion  svn  merge  branch  track 
june 2008 by floehopper
Linus Makes a git of Himself comment #37807
Someone else who thinks that parallel development isn't a good fit with merciless refactoring.
git  linus  parallel  development  branch  refactoring  xp 
june 2008 by floehopper
Linus Makes a git of Himself comment #37735
Someone else who prefers continuous integration over branching & parallel development.
git  linus  continuous  integration  branch  parallel 
june 2008 by floehopper
Git remote branches
Something seems wrong when people are needing to write scripts "to encapsulate all the commands that need to be run when interacting with remote branches in *simple* scenarios".
git  remote  branch  howto 
june 2008 by floehopper
Subversion 1.5 is Ready
"The killer new feature in Subversion 1.5 is merge tracking."
subversion  svn  merge  track  release  branch  vcs 
june 2008 by floehopper

related tags

abstraction  agile  ahead  architecture  branch  bugfix  build  change  cheatsheet  cherry  code  command  commit  comparison  composition  concern  conditional  configuration  conflict  continuous  contribute  control  cost  customize  database  delivery  deployment  development  diff  diverge  done  dvcs  efficiency  empty  enterprise  environment  explicit  export  feature  flag  flickr  fork  fragment  gfr-week-links  git  github  goggles  hell  history  howto  import  increment  incremental  integration  integrity  isolation  iteration  jekyll  jit  jruby  lean  line  linus  linux  local  mainline  merge  model  modular  module  note  open  page  parallel  patch  polymorphism  productivity  project  promiscuous  prompt  pull  push  rebase  ref  refactoring  referrer:chrisjroos  referrer:lukeredpath  referrer:threedaymonk  release  remote  repository  resolve  review  revision  ruby  sake  script  semantic  separate  shell  site  small  source  start  static  status  stop  strategy  submodule  subversion  svn  switch  symbolic  tag  tags  team  testing  toggle  track  trunk  tumblr  tutorial  tw  tweet  upstream  vcs  version  video  view  waste  wip  workflow  xp  zsh 

Copy this bookmark: