We are a team of 2 developers, who needs to develop a small solution in Umbraco. As we do not have the funds for Umbraco Cloud, we are trying to set up a Umbraco/uSync/GitHub solution. For now, our Umbraco solution is very simple and only contains a few custom Document Types and Data Types.
However, after trying countless different .gitignore configurations, we cannot find a configuration, which doesn't give us merge conflicts after just a few commits from either of us. The merge conflicts arise mainly from files in the following folders:
App_Data
obj/Debug
bin
We have tried the following .gitignore configurations with no luck:
Umbraco/Usync .gitignore
Hello,
We are a team of 2 developers, who needs to develop a small solution in Umbraco. As we do not have the funds for Umbraco Cloud, we are trying to set up a Umbraco/uSync/GitHub solution. For now, our Umbraco solution is very simple and only contains a few custom Document Types and Data Types.
However, after trying countless different .gitignore configurations, we cannot find a configuration, which doesn't give us merge conflicts after just a few commits from either of us. The merge conflicts arise mainly from files in the following folders:
We have tried the following .gitignore configurations with no luck:
Do you have any suggestions or maybe even some .gitignore-files, which have been working for you?
Best Regards
Hi
the one I use for projects looks roughly like this
https://github.com/KevinJump/Aubergine/blob/master/.gitignore
from memory this is the visual studio .git ignore ( https://github.com/github/gitignore/blob/master/VisualStudio.gitignore )
with the following Umbraco-ness tacked on.
this tends to cover most situations for me.
update: & you might want to include
**/[Mm]edia/
if you don't want images in the repoHey Kevin,
Thanks! We will try this out and get back to you.
is working on a reply...