Re: [git-users] merge two repos?

2014-02-27 Thread Ed Pataky
again in other words, i want main to now contain all changes from A and B and i want to use only main from now on On Wednesday, February 26, 2014, Ed Pataky ed.pat...@gmail.com wrote: the purpose for me is, i no longer want to commit in A or B only Main but i want the old history to survive

Re: [git-users] merge two repos?

2014-02-26 Thread Ed Pataky
thank you i will read the doc On Wednesday, February 26, 2014, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Thursday, February 27, 2014 8:12:26 AM UTC+1, HWSWMAN wrote: I have a directory ./MAIN/ with /A/ and /B/ under MAIN ./MAIN/ ./MAIN/A/ ./MAIN/B/ A and B have their own repos

Re: [git-users] merge two repos?

2014-02-26 Thread Ed Pataky
the purpose for me is, i no longer want to commit in A or B only Main but i want the old history to survive for those ... it looks like if i do this, A and B will still be indepwndant repos, which is ok, but say i make anchange to A or B , will i see the change in main and can i commit it to main,

Re: [git-users] git users and permissions

2013-07-16 Thread Ed Pataky
think manufacturing real things production manufacturing needs only to read, and they should never push, they read the data and program units for manufacturing developers need the whole thing of course On Tue, Jul 16, 2013 at 7:30 AM, Dale R. Worley wor...@alum.mit.edu wrote: From:

Re: [git-users] reverting back

2013-07-14 Thread Ed Pataky
... and git will put back the old files? On Sat, Jul 13, 2013 at 11:55 PM, William Seiti Mizuta william.miz...@gmail.com wrote: Hi Hwswman, I don't use SourceTree, but I know how to you do it in command line: if you want to delete forever the changes you have done, you need to get the

Re: [git-users] reverting back

2013-07-14 Thread Ed Pataky
, Jul 14, 2013 at 3:59 AM, Ed Pataky ed.pat...@gmail.com wrote: ... and git will put back the old files? On Sat, Jul 13, 2013 at 11:55 PM, William Seiti Mizuta william.miz...@gmail.com wrote: Hi Hwswman, I don't use SourceTree, but I know how to you do it in command line: if you want

[git-users] clone tagged version?

2013-07-14 Thread Ed Pataky
If I want to use GIT to keep track of source code and documents, and use the tag feature to mark revisions ... suppose now developers commit version 1.0 to the repo .. now day to day they make changes, testers test, etc .. now what if someone wanted to go in and grab the last tagged version, the

Re: [git-users] newbie questions

2013-07-03 Thread Ed Pataky
, so they can connect to the subfolders but not the main folder? On Sat, Jun 29, 2013 at 9:38 PM, Ed Pataky ed.pat...@gmail.com wrote: If I setup a bare repo, and all developers track their changes, all is good .. but then one developer makes a bunch of changes that were not tracked

Re: [git-users] Do I have to download all files?

2013-07-02 Thread Ed Pataky
interesting though thank you On Tuesday, July 2, 2013, Dale R. Worley wrote: From: HWSWMAN ed.pat...@gmail.com javascript:; If I create a git repo for multiple projects, for example ALL projects that my team works on, when they clone and pull, do they have to download all the files?

Re: [git-users] Re: Do I have to download all files?

2013-06-30 Thread Ed Pataky
OK thank you ... i like the island idea i will have to look into that On Sun, Jun 30, 2013 at 7:44 PM, John McKown john.archie.mck...@gmail.comwrote: That is part of the design of git. It is a _distributed_ system. Perhaps what you really want would be something like Subversion, in which a

Re: [git-users] newbie questions

2013-06-29 Thread Ed Pataky
words, does every developer have to have an entire copy of the server, or can we all just have the copies we work on and GIT still track the whole thing as one thing? On Fri, Jun 28, 2013 at 7:07 PM, Ed Pataky ed.pat...@gmail.com wrote: So suppose i have a git repo setup, and someone adds a file

Re: [git-users] newbie questions

2013-06-29 Thread Ed Pataky
Gergely you said Again, you can only do this if you don't need the source files to be present on the server, or you can clone it to a separate directory to access, test or serve them. ... I do not understand this .. why cant the files be on the server? I have a std web server with web files ...

Re: [git-users] newbie questions

2013-06-29 Thread Ed Pataky
. It should be different. Tag your releases. Use git archive to make release tarballs. Then push them in the production server for deployment. You can write scripts which can automate the whole process. On Sat, Jun 29, 2013 at 2:21 PM, Ed Pataky ed.pat...@gmail.com wrote: Gergely you said Again

Re: [git-users] newbie questions

2013-06-29 Thread Ed Pataky
deployment strategy should not be based on git. It should be different. Tag your releases. Use git archive to make release tarballs. Then push them in the production server for deployment. You can write scripts which can automate the whole process. On Sat, Jun 29, 2013 at 2:21 PM, Ed Pataky ed.pat

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
Thank you .. question: I created a git repo on the server ... than on my machine i cloned the repo i made some changes, stage, commit, then push ... it says master is checked out? Should I have made a branch first? Why can I not push these changes? How should I push them, or what is the

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
I made a new branch, made changes, commited, pushed .. all good .. why did the file not ftp to the server? On Fri, Jun 28, 2013 at 9:33 AM, Ed Pataky ed.pat...@gmail.com wrote: Thank you .. question: I created a git repo on the server ... than on my machine i cloned the repo i made some

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
Thank you, I did try this but I was confused ... The files are on the server, these are the production files .. they have to be there or there is no website ... so can i still use a bare repo? My understanding of this is that a bare repo simply has the history info (branches, commits, etc) ..

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
ok about the usernames, in general yes i know this is not ideal .. it just happened this way because the developers needed SSH access to everything essentially so they could mess with things that needed full control ... i think because the ssh password on the server is locked to one single ftp

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
ok i have to try this thank you ed On Fri, Jun 28, 2013 at 11:38 AM, Dale R. Worley wor...@alum.mit.eduwrote: Generally, for simple projects with multiple developers, the pattern is to have one central bare repository that is the official copy of all the commits. Each developer then has

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
the downside of this seems to be that all the developers/contributors have to know how to merge correctly On Fri, Jun 28, 2013 at 11:45 AM, Ed Pataky ed.pat...@gmail.com wrote: ok i have to try this thank you ed On Fri, Jun 28, 2013 at 11:38 AM, Dale R. Worley wor...@alum.mit.eduwrote

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
.. but if someone simply goes in by ftp and modifies files, then git has no control over that .. is this correct? On Fri, Jun 28, 2013 at 11:57 AM, Ed Pataky ed.pat...@gmail.com wrote: the downside of this seems to be that all the developers/contributors have to know how to merge correctly

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
in Windows. On Fri, Jun 28, 2013 at 2:07 PM, Ed Pataky ed.pat...@gmail.com wrote: One thing I am concerned about is that it seems like there is no protection from someone in via ftp and changing files .. i assumed that version control meant that the files are protected .. why doesn't git

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
on this ??? i have never seen this in 5 years of using this computer On Fri, Jun 28, 2013 at 1:43 PM, Dale R. Worley wor...@alum.mit.edu wrote: From: Ed Pataky ed.pat...@gmail.com One thing I am concerned about is that it seems like there is no protection from someone in via ftp

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
. On Fri, Jun 28, 2013 at 3:27 PM, Ed Pataky ed.pat...@gmail.com wrote: So you are saying that there is no way to rollback to an old version using git? what is the point then, just to store a bunch of comments? On Fri, Jun 28, 2013 at 12:59 PM, John McKown john.archie.mck...@gmail.com wrote

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
finally got the CLR error fixed, here is the fix: https://github.com/Windower/Issues/issues/170 On Fri, Jun 28, 2013 at 2:06 PM, Ed Pataky ed.pat...@gmail.com wrote: Thank you ... about git add i thought once you add the file you never have to do that again? ... doesn't add tell git to track

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
it up that way) and other things. On Fri, Jun 28, 2013 at 3:27 PM, Ed Pataky ed.pat...@gmail.com wrote: So you are saying that there is no way to rollback to an old version using git? what is the point then, just to store a bunch of comments? On Fri, Jun 28, 2013 at 12:59 PM, John McKown