question

RodFalanga avatar image
1 Vote"
RodFalanga asked RodAtWork commented

Does Visual Studio allow a user to choose to commit all their changes, ignoring what's in the remote?

Where I work we are still using TFS, with TFVC. I'm hoping to get my colleagues to adopt Git, but that's a slow process.

One really bad habit of my some of my colleagues, when checking in code changes, is to check in all their changes, ignoring what's already in TFS. This is a function of Visual Studio. When performing a check-in, if Visual Studio detects a conflict, and if the developer chooses to review the conflicts, there is a button in Visual Studio to accept all of the user's changes and ignore the changes in TFS. They always choose that option, blowing away other people's work. I've tried to change that behavior the last 5 years. I now realize they're just going to do it that way. Honestly, they'd be better off working alone, because of this behavior of removing other developer's changes.

I'm wondering, when Visual Studio works with a Git repo at a remote, like Azure DevOps Services or GitHub, does it give the developer a choice, when resolving conflicts, to just shove all their changes in the push, or does it insist upon the user performing a pull, before it allows them to push changes to the remote?

office-teams-windows-itpro
· 3
5 |1600 characters needed characters left characters exceeded

Up to 10 attachments (including images) can be used with a maximum of 3.0 MiB each and 30.0 MiB total.

I'm wondering, when Visual Studio works with a Git repo at a remote.

Yes, Visual Studio works with GIT.

A common team pattern in GIT are pull requests and branches. Keep in mind, simply moving to GIT will not fix bad behavior. Anyway, GIT is well documented.


0 Votes 0 ·

Hi @RodFalanga,

As we are mainly responsible for general question of Microsoft Teams for Linux, your question is not supported by us. So I will remove teams tag from your thread. If you have any questions on Visual Studio, you could post it here:

https://developercommunity.visualstudio.com/search?space=8&ftype=problem&preview2=true

Thanks for your understanding and patience!

0 Votes 0 ·

I totally understand. I tried posting it using tag "visual-studio", but that wasn't an option. So, I choose "team" at random. It seemed the closest to Visual Studio.

0 Votes 0 ·

0 Answers