Search found 65 matches

by AjarnMark
Fri Jul 25, 2008 10:46 am
Forum: Support (Fortress)
Topic: Multiple Branch Management - Need a better way
Replies: 3
Views: 3424

Do-Overs!

Just to close the loop... Jeremy, thanks for spending the time on the phone with me. It is now clear that the approach I had setup was working fine when we had distinct breaks between working on versions because we juggled multiple applications, but as our schedule has compressed, we have narrowed o...
by AjarnMark
Wed Jul 23, 2008 2:51 pm
Forum: Support (Fortress)
Topic: Merge Result - Where did THAT code come from?
Replies: 6
Views: 5371

I see what happened... The common ancestor file had those lines of code in them, and then the developer made the same change (deleting those lines) in two different branches, which when merged together, the process seemed to think that the code lines should still be there. It seems counter-intuitive...
by AjarnMark
Wed Jul 23, 2008 12:55 pm
Forum: Support (Fortress)
Topic: Multiple Branch Management - Need a better way
Replies: 3
Views: 3424

Multiple Branch Management - Need a better way

I seem to have gotten my team into a bit of a mess with our branching and merging policy and am looking for recommendations on a better way or best practices. I have read Eric Sink's article series which got me started, but we went one level farther and it's causing headaches. In short, when merging...
by AjarnMark
Wed Jul 23, 2008 11:00 am
Forum: Support (Fortress)
Topic: Merge Result - Where did THAT code come from?
Replies: 6
Views: 5371

Merge Result - Where did THAT code come from?

In trying to resolve a Merge Conflict, I choose Show Merge and it opened the 3-pane window. In the middle pane ("Merge Result") there are some lines of code that do not have corresponding lines in either the Target File pane or the Origin File pane. So, if the code was not in the Target Fi...
by AjarnMark
Tue Mar 25, 2008 4:53 pm
Forum: Support (Fortress)
Topic: VS2008 IDE Cannot Use VS2005 Plugin?
Replies: 1
Views: 2988

VS2008 IDE Cannot Use VS2005 Plugin?

On a system that already had Visual Studio 2005 and Fortress 1.0.6 installed, I just installed Visual Studio 2008. The only Source Control option available is the VS2003 Client. I had the VS2005 IDE working with the VS2005 client just fine. Does Visual Studio 2008 not support the 2005 client? Is thi...