Jump to content

Search the Community

Showing results for tags 'ignore'.



More search options

  • Search By Tags

    Type tags separated by commas.
  • Search By Author

Content Type


Forums

  • Plastic SCM
    • General
    • Installation and configuration
    • Unity 3D
    • Plastic SCM on Mac
    • Plastic SCM on Linux
    • Gluon
    • Git interop
    • Integrations
    • Community Edition
    • Branching and merging
    • Announcements
  • Plastic SCM 4.0 Beta (Closed)
  • Plastic Cloud
    • General
    • Configuration
  • SemanticMerge
    • General
    • License
    • SCM's configuration
    • Share your experience!
    • External Parsers
  • GitJungle
  • Method History for Subversion

Find results in...

Find results that contain...


Date Created

  • Start

    End


Last Updated

  • Start

    End


Filter by number of...

Joined

  • Start

    End


Group


AIM


MSN


Website URL


ICQ


Yahoo


Jabber


Skype


Location


Interests

Found 1 result

  1. Is there a way to ignore a ignore specific line in specific file? Otherwise is a way to say whichever version of the file is fine for merging? In our Unity project we set the project version to match what cs we are working on, which gives a lot of merge conflicts... If there is no built in feature to deal with a known recurring conflict, is there any good workaround? We are thinking of setting up a pre-merge trigger that sets the value to 1 or something like that, but would much rather use a existing feature instead.
×
×
  • Create New...