|
|
|
date: Tue, 1 Apr 2008 09:36:04 -0700,
group: microsoft.public.vstudio.sourcesafe
back
RE: View conflicts on check in
Hello Dave,
Thanks for your waiting.
By the time you got that message you should already have gotten a
Diff-Merge window!
Basically you do a checkin, you're prompted to merge, you merge partially
and save (the merge result is saved over the local file) or cancel the
merge and don't save anything. The local file is updated with the result of
the partial merge. Then you attempt again to checkin - this time you're
prompted with the message "have the conflicts in the file have been
resolved"?
If you answer yes - there will be no merge this second time - your local
file will simply become the latest version - so no, there is no option for
seeing how VSS will merge the files.
If you answer no - the next prompt is "Redo the automatic merge"? If you
answer yes, you may see again the merge dialog displayed if there are still
conflcts (this time using what you saved in the first step against the
server version).
Anyway, we should try to resolve the conflicts the first time you're
prompted with the merge window, and avoid this prompt altogether.
Hope this helps. Please feel free to let us know if there is anything
unclear. We are glad to assist you.
Have a great day,
Best regards,
Wen Yuan
Microsoft Online Community Support
Delighting our customers is our #1 priority. We welcome your comments and
suggestions about how we can improve the support we provide to you. Please
feel free to let my manager know what you think of the level of service
provided. You can send feedback directly to my manager at:
msdnmg@microsoft.com.
==================================================
This posting is provided "AS IS" with no warranties, and confers no rights.
date: Wed, 02 Apr 2008 08:57:50 GMT
author: (Wen Yuan Wang [MSFT])
RE: View conflicts on check in
Hi;
I never got the merge window. What I did was the following:
1) Checked files out.
2) Another person checked changes in.
3) I changed the file too.
4) Checked the file in.
--
thanks - dave
david_at_windward_dot_net
http://www.windwardreports.com
Cubicle Wars - http://www.windwardreports.com/film.htm
""Wen Yuan Wang [MSFT]"" wrote:
> Hello Dave,
> Thanks for your waiting.
>
> By the time you got that message you should already have gotten a
> Diff-Merge window!
>
> Basically you do a checkin, you're prompted to merge, you merge partially
> and save (the merge result is saved over the local file) or cancel the
> merge and don't save anything. The local file is updated with the result of
> the partial merge. Then you attempt again to checkin - this time you're
> prompted with the message "have the conflicts in the file have been
> resolved"?
> If you answer yes - there will be no merge this second time - your local
> file will simply become the latest version - so no, there is no option for
> seeing how VSS will merge the files.
> If you answer no - the next prompt is "Redo the automatic merge"? If you
> answer yes, you may see again the merge dialog displayed if there are still
> conflcts (this time using what you saved in the first step against the
> server version).
>
> Anyway, we should try to resolve the conflicts the first time you're
> prompted with the merge window, and avoid this prompt altogether.
>
> Hope this helps. Please feel free to let us know if there is anything
> unclear. We are glad to assist you.
>
> Have a great day,
> Best regards,
> Wen Yuan
>
> Microsoft Online Community Support
> Delighting our customers is our #1 priority. We welcome your comments and
> suggestions about how we can improve the support we provide to you. Please
> feel free to let my manager know what you think of the level of service
> provided. You can send feedback directly to my manager at:
> msdnmg@microsoft.com.
> ==================================================
> This posting is provided "AS IS" with no warranties, and confers no rights.
>
>
date: Wed, 2 Apr 2008 08:18:02 -0700
author: David Thielen am
RE: View conflicts on check in
Hello Dave,
Thanks for your reply.
If you didn't get merge windows, this means VSS doesn't found any conflict
on your files. Actually, the dialog box always appears, even though there
is no conflicts exist. On the other side, when VSS detects conflict exist,
it should show the merge dialog for you.
Obviously, you didn't do any change in your scenario. Thus, there is no
option to show the merge dialog, because no conflict exists.
http://support.microsoft.com/kb/181089/en-us
[INFO: Dialog Box Appears Even When No Conflicts Exist]
Hope this helps. Please feel free to let us know if you have any more
concern. We are glad to assist you.
Have a great day,
Best regards,
Wen Yuan
Microsoft Online Community Support
Delighting our customers is our #1 priority. We welcome your comments and
suggestions about how we can improve the support we provide to you. Please
feel free to let my manager know what you think of the level of service
provided. You can send feedback directly to my manager at:
msdnmg@microsoft.com.
==================================================
Get notification to my posts through email? Please refer to
http://msdn.microsoft.com/subscriptions/managednewsgroups/default.aspx#notif
ications.
Note: The MSDN Managed Newsgroup support offering is for non-urgent issues
where an initial response from the community or a Microsoft Support
Engineer within 1 business day is acceptable. Please note that each follow
up response may take approximately 2 business days as the support
professional working with you may need further investigation to reach the
most efficient resolution. The offering is not appropriate for situations
that require urgent, real-time or phone-based interactions or complex
project analysis and dump analysis issues. Issues of this nature are best
handled working with a dedicated Microsoft Support Engineer by contacting
Microsoft Customer Support Services (CSS) at
http://msdn.microsoft.com/subscriptions/support/default.aspx.
==================================================
This posting is provided "AS IS" with no warranties, and confers no rights.
date: Thu, 03 Apr 2008 10:22:49 GMT
author: (Wen Yuan Wang [MSFT])
RE: View conflicts on check in
Yes there are changes. First I know there are changes because I made them.
Second, it would not ask me if the merge was successful if there are no
changes.
--
thanks - dave
david_at_windward_dot_net
http://www.windwardreports.com
Cubicle Wars - http://www.windwardreports.com/film.htm
""Wen Yuan Wang [MSFT]"" wrote:
> Hello Dave,
> Thanks for your reply.
>
> If you didn't get merge windows, this means VSS doesn't found any conflict
> on your files. Actually, the dialog box always appears, even though there
> is no conflicts exist. On the other side, when VSS detects conflict exist,
> it should show the merge dialog for you.
>
> Obviously, you didn't do any change in your scenario. Thus, there is no
> option to show the merge dialog, because no conflict exists.
>
> http://support.microsoft.com/kb/181089/en-us
> [INFO: Dialog Box Appears Even When No Conflicts Exist]
>
> Hope this helps. Please feel free to let us know if you have any more
> concern. We are glad to assist you.
> Have a great day,
> Best regards,
> Wen Yuan
>
> Microsoft Online Community Support
> Delighting our customers is our #1 priority. We welcome your comments and
> suggestions about how we can improve the support we provide to you. Please
> feel free to let my manager know what you think of the level of service
> provided. You can send feedback directly to my manager at:
> msdnmg@microsoft.com.
> ==================================================
> Get notification to my posts through email? Please refer to
> http://msdn.microsoft.com/subscriptions/managednewsgroups/default.aspx#notif
> ications.
> Note: The MSDN Managed Newsgroup support offering is for non-urgent issues
> where an initial response from the community or a Microsoft Support
> Engineer within 1 business day is acceptable. Please note that each follow
> up response may take approximately 2 business days as the support
> professional working with you may need further investigation to reach the
> most efficient resolution. The offering is not appropriate for situations
> that require urgent, real-time or phone-based interactions or complex
> project analysis and dump analysis issues. Issues of this nature are best
> handled working with a dedicated Microsoft Support Engineer by contacting
> Microsoft Customer Support Services (CSS) at
> http://msdn.microsoft.com/subscriptions/support/default.aspx.
> ==================================================
> This posting is provided "AS IS" with no warranties, and confers no rights.
>
>
date: Thu, 3 Apr 2008 06:48:03 -0700
author: David Thielen am
RE: View conflicts on check in
Hello Dave,
1 You can set "Use Visual Merge" to "Yes". Thereby, the Merge dialog will
show up each time VS merges files.
2 If the merge dialog doesn't show up although you have set "Yes" in "Use
Visual Merge" option, could you please give us detailed steps to reproduce
the issue?
I have done the following steps on my side to reproduce the issue. But, it
seems work fine. I can get Merge Dialog when checking in the files. Am I
missing anything here? Please don't hesitate to correct me.
1). Created a Copy-Modify-Merge Model VSS database.
2). Login VSS Explorer as UserA, and added a txt file into new VSS database.
3). Checked out a txt file from VSS Explorer; made some changes in it on
local work folder.
4). Login VSS Explorer as UserB, and checked out the same txt file. Then
made some changes on it in local work folder.
5). Login VSS Explorer as UserA again, and checked in the file.
6). Login VSS Explorer as UserB again, and checked in the file.
In this time, I got a message said "Have any conflicts in index.html been
properly resolved"?
If I answered as "Yes", the Merge dialog will show up.
If I answered as "No", I will received another message said"Redo the
automatic merge?". Merge dialog will show up, if I answered "Yes".
Have a great day, Please feel free to let me know if there is anything
unclear. We are glad to assist you.
Best regards,
Wen Yuan
Microsoft Online Community Support
Delighting our customers is our #1 priority. We welcome your comments and
suggestions about how we can improve the support we provide to you. Please
feel free to let my manager know what you think of the level of service
provided. You can send feedback directly to my manager at:
msdnmg@microsoft.com.
==================================================
This posting is provided "AS IS" with no warranties, and confers no rights.
date: Mon, 07 Apr 2008 09:46:34 GMT
author: (Wen Yuan Wang [MSFT])
|
|
