All Questions
Tagged with merging pair-programming
1 question
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 ...