Skip to main content

All Questions

Filter by
Sorted by
Tagged with
3 votes
2 answers
186 views

Handling Difficult Distributed Version Control System Merges With Pair Programming

A common problem in my very small team workflow is handling merges from trunk/stable repositories up to feature branches which are ahead of the trunk or stable versions, but which need to track the ...
Warren  P's user avatar
  • 830