[git-users] how to define a GIT repository
Greetings!!! We are implementing the GIT in our project implementation and delivery process. we are facing problem how to define branches for parallel development and optimum point for merging. Let me first brief you all our project and delivery structure as below Could any one suggest me the best possible structure/branches and merge we are facing problem how to define branches for parallel development and optimum point for merging. At a given point of time we are having a a. development going on b. system testing for the development c. UAT issues for previously delivered job We also do a periodic offshore environment refresh from UAT environment 1# offshore Team Three different Team (Parallel Development) Team A - Development/UAT issue Fixing Team B - Development/UAT issue Fixing Team C - Development/UAT issue Fixing Setps - Development after development Move for System Testing after system testing Move for UAT Testing (onsite UAT server) after UAT move for Staging (onsite staging server) afer staging move for Production Offshore Environment 1. Development 2. System Testing and ST issue fixing Periodic offshore environment refresh is done a. to update with latest code changes b. to get the onsite changes 2# Onsite Team Urgent fixes done in onsite UAT server after UAT move to production -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] how to use git in folders subfolders ?
how guys i have 7 folders - 1 - main 6 subfolders for any projects the thing is, the another 6 folders git work perfect but if i try do a commit in the main, always apper that git status # On branch master # Changes not staged for commit: # (use git add file... to update what will be committed) # (use git checkout -- file... to discard changes in working directory) # (commit or discard the untracked or modified content in submodules) i tried use git commit -am , git commit add . but always dont get this commits, so what can i do? cheers. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Git rebase for cleanup, after pushing
On Sun, 2013-06-02 at 08:32 -0700, Sam Roberts wrote: If the tests run before the merge into master, then the normal procedure is that after you know the branch tests pass, you rebase your-feature to clean it up, and do a push -f to overwrite it. Then people comment, maybe you rewrite again based on their comments. Only when everybody is happy does it merge to master. At that point you can't rewrite. Since nobody should be doing work based on your feature branch, it doesn't matter how often you rebase it. Yes, sorry, I made a mistake near the end of my email when I wrote However, I've already pushed my branch to master. That should have read However, I've already pushed my branch to the server Git repository. In short, I have to push my personal branch to the main Git repo when it's still a work in progress, and so others will get it in their repos when they do a git pull. My question was, what's the best way to clean up before merging those changes to the master branch. It looks like, as long as I can reasonably expect that others have not checked out my branch I can rewrite my branch using rebase -i and that's OK. I'm still looking for a powerful, but easy-to-use interface to git rebase -i. I'm using Magit (Emacs mode) and it's ok, but something that makes it simpler to slice and dice commits down to the patch chunk level while hiding the details of using stash/pop, etc. would be SO amazing. I envision something like, on the left a list of commits, and on the right a window with diffs. You can rearrange/modify commit messages/delete the commits in the left window, and when you select a commit you can see the patch chunks for that commit. You can drag by file and/or by chunk from into another commit. The ability to even edit a given patch/chunk would be even more cool. Safety features such as being able to show a diff between the tree before the rebase and after all the rebase steps were complete, would be ideal. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] how to use git in folders subfolders ?
From: git-guy douglasdeod...@gmail.com how guys i have 7 folders - 1 - main 6 subfolders for any projects the thing is, the another 6 folders git work perfect but if i try do a commit in the main, always apper that git status # On branch master # Changes not staged for commit: # (use git add file... to update what will be committed) # (use git checkout -- file... to discard changes in working directory) # (commit or discard the untracked or modified content in submodules) You have told us what happened. You have not told us what you expected to happen. What did you expect to happen? Dale -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
