Bitbucket Repository with Sourcetree, Visual Studio Project

Asked

Viewed 239 times

1

I’m creating a new project on Visual Studio 2015 , i created the repository on BitBucket, so I created the project, the problem is that when one of the project’s users Push he doesn’t update.

For example : I added the Class Teste in the project Dominio and gave Push but when the other user gives Pull this class does not appear in the solution explorer despite being in the project folder. Someone knows something about ?

I looked in here and elsewhere and found nothing about it if this is not the right place to ask me let me know.

EDIT : I’m giving Push by Sourcetree, the first time I added the lower layer which is a Classlibrary , the csproj was, but then it wasn’t anymore , here’s my .gitignore

    ## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
[Xx]64/
[Xx]86/
[Bb]uild/
bld/
[Bb]in/
[Oo]bj/
git bitbucket sourcetree
  • 1

    Are you doing commit of the archive .csproj also?

  • Yes I am doing yes.

  • I just realized he’s only sending one layer , I have two layers , infra and dominio. he only commands from Dominio. How do I fix it ??

  • I don’t know what you’re talking about. More details are needed, how you’re doing the commit? Were the files properly added to the repository? How is the file .gitignore?

  • I will improve my question...

  • See if the changes are enough

Show 1 more comment

1 answer

2


It’s important to note if the file . csproj is also going into Commit and there was no conflict in it. Git itself now provides a file. gitattributes with information to resolve these conflicts.If you figure it out will solve this problem, see below :

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following 
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
*.sln       merge=binary
*.csproj    merge=binary
#*.vbproj    merge=binary
#*.vcxproj   merge=binary
#*.vcproj    merge=binary
#*.dbproj    merge=binary
#*.fsproj    merge=binary
#*.lsproj    merge=binary
#*.wixproj   merge=binary
#*.modelproj merge=binary
#*.sqlproj   merge=binary
#*.wwaproj   merge=binary

Browser other questions tagged git bitbucket sourcetree

You are not signed in. Login or sign up in order to post.