Git can't do locking because of how it is designed. Merge conflicts with
binaries are actually pretty easy to resolve though, you pick one version or
the other. If you often run into conflicts maybe you can devise a workflow
where people communicate what binaries they are currently working on.
Tekkub
GitHub Tech Support
http://support.github.com/
Join us on IRC: #github on freenode.net
Discussion group: [email protected]
On Sat, Mar 6, 2010 at 5:48 AM, e66n06 <[email protected]> wrote:
> Hi,
>
> I'm looking into the possiblity of using github to host the source
> code and data assets for a mini game I am working on with a few other
> people.
>
> I'm new to git, but familiar with accurev and perforce.
>
> I want to know how best to manage binary assets with git.
>
> In the past I have used perforce for asset management. Perforce
> supports locking a file so only one user can change it at any given
> time.
>
> It's really important that we have a way of ensuring that only one
> person can edit a 3d model or a texture at any one time, because these
> files cannot be merged.
>
> What would be the git way of managing this sort of project? Or is git
> the wrong system for mini game development?
>
> Thanks,
>
> Ash
>
> --
> You received this message because you are subscribed to the Google Groups
> "GitHub" group.
> To post to this group, send email to [email protected].
> To unsubscribe from this group, send email to
> [email protected]<github%[email protected]>
> .
> For more options, visit this group at
> http://groups.google.com/group/github?hl=en.
>
>
--
You received this message because you are subscribed to the Google Groups
"GitHub" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/github?hl=en.
