Jump to content

GitHub Visual studio merge problems

DirtyDane

Me and my group are working on a project for our Web development course (we are using asp.net and a few other things) our problem is trying to learn GitHub. So far I have a fair understanding of how it operates, but we keep running into issues with GitHub flipping out and refusing to merge pull requests because of the 4 files that are generated when you open a file in visual studio. v15/Server/sqlite3/storage.ide-wal is the name of one of these. 

 

If anyone knows how to make it so GitHub quits loosing its marbles whenever one of us try to merge because of these files it would be VERY MUCH appreciated. 

 

Thank you!

“I am Holo the Wise Wolf. I know that there are things in this world that I do not know and that makes me wise!”

Spoiler

Use the following style specs for your profile!
Screeninator:  Asus GeForce GTX 750Ti 2GB
Powermathingy: EVGA 500W
Stickaminator: Crucial 16GB 「4x4GB」DDR3-1600
Procrastinator: Intel i5-4460 3.2ghz
Holdametalicizor:  Corsair 200R 
Noisoundacreator:  Razer kracken pro
Attatchamajiggy :  Asrock H97 Anniversairy ATX LGA1150
Remembrerthing:  i've got a-lot of drives
Flat-Colorful-Thing:  LG not actually sure the model of it
See-A-Move-O: Razer Mamba 2012
ButtonBoard:  Razer Deathstalker 

 

Link to comment
Share on other sites

Link to post
Share on other sites

4 minutes ago, Zagna said:

this wont ignore stuff we need to make the whole thing work at all will it? just those particular files. (and others that may cause issue)

 

(we need the bin folder to remain untouched)

Edited by DirtyDane

“I am Holo the Wise Wolf. I know that there are things in this world that I do not know and that makes me wise!”

Spoiler

Use the following style specs for your profile!
Screeninator:  Asus GeForce GTX 750Ti 2GB
Powermathingy: EVGA 500W
Stickaminator: Crucial 16GB 「4x4GB」DDR3-1600
Procrastinator: Intel i5-4460 3.2ghz
Holdametalicizor:  Corsair 200R 
Noisoundacreator:  Razer kracken pro
Attatchamajiggy :  Asrock H97 Anniversairy ATX LGA1150
Remembrerthing:  i've got a-lot of drives
Flat-Colorful-Thing:  LG not actually sure the model of it
See-A-Move-O: Razer Mamba 2012
ButtonBoard:  Razer Deathstalker 

 

Link to comment
Share on other sites

Link to post
Share on other sites

1 minute ago, DirtyDane said:

this wont ignore stuff we need to make the whole thing work at all will it? just those particular files. (and others that may cause issue)

 

(we need the bin folder to remain untouched)

Then just don't use the lines for Release/Debug?

 

Link to comment
Share on other sites

Link to post
Share on other sites

7 hours ago, Zagna said:

Then just don't use the lines for Release/Debug?

 

Alright I appreciate it. Thank you

“I am Holo the Wise Wolf. I know that there are things in this world that I do not know and that makes me wise!”

Spoiler

Use the following style specs for your profile!
Screeninator:  Asus GeForce GTX 750Ti 2GB
Powermathingy: EVGA 500W
Stickaminator: Crucial 16GB 「4x4GB」DDR3-1600
Procrastinator: Intel i5-4460 3.2ghz
Holdametalicizor:  Corsair 200R 
Noisoundacreator:  Razer kracken pro
Attatchamajiggy :  Asrock H97 Anniversairy ATX LGA1150
Remembrerthing:  i've got a-lot of drives
Flat-Colorful-Thing:  LG not actually sure the model of it
See-A-Move-O: Razer Mamba 2012
ButtonBoard:  Razer Deathstalker 

 

Link to comment
Share on other sites

Link to post
Share on other sites

8 hours ago, Zagna said:

Then just don't use the lines for Release/Debug?

 

So I gave that a shot, and it seems to still include those files. Is there a specific way they need to be implemented? or a specific way that the .gitignore file needs to be placed in there? It still find the files and throws up a conflict every time. 

 

The GitIgnore is even joining in the conflict party now. Maybe I dont fully understand what I am doing to the extent I thought I did. 

Screenshot (34).png

“I am Holo the Wise Wolf. I know that there are things in this world that I do not know and that makes me wise!”

Spoiler

Use the following style specs for your profile!
Screeninator:  Asus GeForce GTX 750Ti 2GB
Powermathingy: EVGA 500W
Stickaminator: Crucial 16GB 「4x4GB」DDR3-1600
Procrastinator: Intel i5-4460 3.2ghz
Holdametalicizor:  Corsair 200R 
Noisoundacreator:  Razer kracken pro
Attatchamajiggy :  Asrock H97 Anniversairy ATX LGA1150
Remembrerthing:  i've got a-lot of drives
Flat-Colorful-Thing:  LG not actually sure the model of it
See-A-Move-O: Razer Mamba 2012
ButtonBoard:  Razer Deathstalker 

 

Link to comment
Share on other sites

Link to post
Share on other sites

13 hours ago, DirtyDane said:

So I gave that a shot, and it seems to still include those files. Is there a specific way they need to be implemented? or a specific way that the .gitignore file needs to be placed in there? It still find the files and throws up a conflict every time. 

 

The GitIgnore is even joining in the conflict party now. Maybe I dont fully understand what I am doing to the extent I thought I did. 

Rename that VisualStudio.gitignore to just .gitignore

Now it's doing nothing.

Link to comment
Share on other sites

Link to post
Share on other sites

7 hours ago, Zagna said:

Rename that VisualStudio.gitignore to just .gitignore

Now it's doing nothing.

 

We managed to resolve the issue, figured out that the entire .vs folder was the problem and that simply removing it before omitting anything would prevent the problem from occurring. Thanks for the help though

“I am Holo the Wise Wolf. I know that there are things in this world that I do not know and that makes me wise!”

Spoiler

Use the following style specs for your profile!
Screeninator:  Asus GeForce GTX 750Ti 2GB
Powermathingy: EVGA 500W
Stickaminator: Crucial 16GB 「4x4GB」DDR3-1600
Procrastinator: Intel i5-4460 3.2ghz
Holdametalicizor:  Corsair 200R 
Noisoundacreator:  Razer kracken pro
Attatchamajiggy :  Asrock H97 Anniversairy ATX LGA1150
Remembrerthing:  i've got a-lot of drives
Flat-Colorful-Thing:  LG not actually sure the model of it
See-A-Move-O: Razer Mamba 2012
ButtonBoard:  Razer Deathstalker 

 

Link to comment
Share on other sites

Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now

×