Timeline for Handling Difficult Distributed Version Control System Merges With Pair Programming
Current License: CC BY-SA 3.0
7 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Jun 6, 2013 at 12:46 | comment | added | Warren P | Well, long lived feature branches. | |
| Jun 5, 2013 at 15:52 | answer | added | Karl Bielefeldt | timeline score: 4 | |
| Jun 5, 2013 at 15:34 | comment | added | Andy | Why do you need to merge from trunk to a branch? Maybe the problem is in that process. | |
| Jun 5, 2013 at 15:30 | answer | added | Balog Pal | timeline score: 0 | |
| Jun 5, 2013 at 15:14 | comment | added | Balog Pal | IMO you should not merge trunk into a feature branch, as then it will be just random garbage. Rather consolidate and rebase on top. Or leave alone and merge merge back ASAP. | |
| Jun 5, 2013 at 15:08 | history | edited | Warren P | CC BY-SA 3.0 |
added 490 characters in body
|
| Jun 5, 2013 at 15:01 | history | asked | Warren P | CC BY-SA 3.0 |