Jump to content

Search the Community

Showing results for tags 'git'.

  • Search By Tags

    Type tags separated by commas.
  • Search By Author

Content Type


Forums

  • General
    • Lounge/General chat
    • Education
    • Jobs
    • Marketplace
  • Houdini
    • General Houdini Questions
    • Effects
    • Modeling
    • Animation & Rigging
    • Lighting & Rendering + Solaris!
    • Compositing
    • Games
    • Tools (HDA's etc.)
  • Coders Corner
    • HDK : Houdini Development Kit
    • Scripting
    • Shaders
  • Art and Challenges
    • Finished Work
    • Work in Progress
    • VFX Challenge
    • Effects Challenge Archive
  • Systems and Other Applications
    • Other 3d Packages
    • Operating Systems
    • Hardware
    • Pipeline
  • od|force
    • Feedback, Suggestions, Bugs

Product Groups

There are no results to display.


Find results in...

Find results that contain...


Date Created

  • Start

    End


Last Updated

  • Start

    End


Filter by number of...

Joined

  • Start

    End


Group


Website URL


Skype


Name


Location


Interests

Found 1 result

  1. Hi everyone! I am looking for a way for multiple people to work on the same .hip file. Since .hip files can be exported as text, I assumed it would be possible to simply use git for versioning (and merging the edits made by multiple people). However, it does not seem to be that straightforward. To test this approach, I created a very simple network (first attachment). Now I made two edits (second and third attachment), each adding a transform node to the network. I assumed these changes could be merged, creating a new network containing both transform nodes. However, attempting to merge the .hip files using git resulted in several conflicts. Some of these could be solved trivially, (like changes to the viewport or the last edit timestamp) but there are several conflicts (last attachment) for which I could not find a way of resolving which produces my expected result. Does anybody have experience with this approach? How do you handle multiple people working on the same .hip file? Any help would be appreciated!
×
×
  • Create New...