Search found 3 matches
- Fri May 23, 2008 3:24 am
- Forum: Support (Vault)
- Topic: merge doesn't add files and folders before checkin
- Replies: 1
- Views: 1375
merge doesn't add files and folders before checkin
When merging I like to check that everything compiles before commiting my changes. Unfortunately the added files and folders (probably the same with delete) doesn't happen on the disk before I commit. That makes it impossible to check whether the merge is correct before commiting. I think vault shou...
- Mon Apr 07, 2008 5:54 am
- Forum: Support (DiffMerge)
- Topic: DiffMerge request for functionality
- Replies: 2
- Views: 4760
Thanks for your quick answer. You are right it is an akward situation - but I think it is quite common. I suggest a simple extension to the 3-way view: [T][M] so you can open the A,B diff from the pane (and the A,T diff from the [T] pane). That way you don't have to make the diff separately and it s...
- Fri Apr 04, 2008 8:50 am
- Forum: Support (DiffMerge)
- Topic: DiffMerge request for functionality
- Replies: 2
- Views: 4760
DiffMerge request for functionality
3 way merge TA T ---------+------+--------* branch \ \----+--------+ A B The drawing about describes my situation. I have a development path that end in T. I have a ‘release’ path which has previously been merged into the development path (A has been synchronized with TA). I now want to merge the d...