Sign in Register
Go to solution
Copied to clipboard

Flag this post as spam?

This post will be reported to the moderators as potential spam to be looked at


  • Martin Edvardsen 2 posts 82 karma points
    Nov 01, 2019 @ 08:21
    Martin Edvardsen
    0

    Umbraco/Usync .gitignore

    uSync
    Umbraco 8

    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:

    • App_Data
    • obj/Debug
    • bin

    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

    Copy Link
  • Kevin Jump 2310 posts 14695 karma points MVP 7x c-trib
    Nov 01, 2019 @ 09:29
    Kevin Jump
    100

    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. 

    # Umbraco Things
**/[Uu]mbraco/
**/[Uu]mbraco_[Cc]lient/
**/App_Data/
**/App_Data/[Pp]review/
**/App_Data/TEMP/
**/App_Data/NuGetBackup/
**/App_Data/Umbraco.config
**/App_Data/cache/

    this tends to cover most situations for me.

    update: & you might want to include **/[Mm]edia/ if you don't want images in the repo

    Copy Link
  • Martin Edvardsen 2 posts 82 karma points
    Nov 01, 2019 @ 10:14
    Martin Edvardsen
    0

    Hey Kevin,

    Thanks! We will try this out and get back to you.

    Copy Link
Please Sign in or register to post replies

Write your reply to:

Draft