[git-users] Re: issue in deployment : fatal: unable to create '.git/index.lock': File exists
Hi Erwin, Finding the right branching/deployment model in Git is pretty much up to your imagination :) However, if you're not the creative type, there's a de-facto best practice model here: http://nvie.com/posts/a-successful-git-branching-model/ Maybe you'll find this model inspiring. Note that he uses master as his production branch though (but it's all just naming). The way he does release branching and tagging is the interesting part for you, I think. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/ww35P_8APlwJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: issue in deployment : fatal: unable to create '.git/index.lock': File exists
Oh, by the way, the model is commonly known as git-flow, and there's a mailing list dedicated to it: https://groups.google.com/forum/#!forum/gitflow-users And also a git-wrapper that makes it easier to use (but don't start using it before you know what's going on under the hood): https://github.com/nvie/gitflow -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/D1OD8ky6JmgJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: issue in deployment : fatal: unable to create '.git/index.lock': File exists
Thanks Thomas .. I found it yesterday ... but good to know that's you're backing it ... excellent article I learn a lot and started our model base on it On Jul 17, 10:16 pm, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: Oh, by the way, the model is commonly known as git-flow, and there's a mailing list dedicated to it: https://groups.google.com/forum/#!forum/gitflow-users And also a git-wrapper that makes it easier to use (but don't start using it before you know what's going on under the hood): yes of course , starting simple.. (that's why I don't want to use any Git GUI before understanding more than the basics .. https://github.com/nvie/gitflow -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: issue in deployment : fatal: unable to create '.git/index.lock': File exists
I guess it's a stupid process ... resolved to change it to simple 'master' and 'develop' branches from which I deploy to the remote server , whi did I try to make it complex... On Jul 16, 8:50 am, erwin kadou...@gmail.com wrote: I don't know if the way I set my deployment is the cause , but I am getting this error when trying to deploy via Capistrano so first of all is my deployment stragtegy good or not ? I have 2 branches 'staging' and 'stable' (local remote) from where I deploy unto 2 sites : staging.mydomain.com / www.mydomain.com my development process is : STEP 1: after local tests - git commit -am 'tests ok' - git push origin master STEP 2: then I need to test live on the staging web server - git co staging - git merge master - git push origin staging deploy branch 'staging' in staging phase If more tests needed, I come back to STEP 1, until staging is working as per requirements if staging is running fine, STEP 3: - git co stable - git merge master (should I l merge from 'staging' ?) - git push origin stable deploy branch 'stable' in production phase I have no issue in STEP 1 and STEP 2, but after an initial STEP3 deployment, I get errors trying to do other production deployment -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
