Re: [git-users] Keeping IDE files in a public project
Cool, I think I'll use something like this. (Except that I'll do `merge --squash` to merge back my changes.) Thanks Dale and Gergely! On Mon, Mar 25, 2013 at 5:24 PM, Dale R. Worley wrote: > One approach might be to keep one set of branches that have your IDE > files, and one set of branches that don't. Something like: > > 1. remote tracking branch from the authoritative repository > 2. your working branch, without IDE files > 3. your working branch(es), with IDE files > > You work in #3. Changes can be moved from #2 to #3 can be done with > ordinary merging. Changes can be moved from #3 to #2 using something > like "git filter-tree" (presumably controlled by a version-controlled > file that tells what to leave out). > > Dale > > -- > You received this message because you are subscribed to a topic in the > Google Groups "Git for human beings" group. > To unsubscribe from this topic, visit > https://groups.google.com/d/topic/git-users/xT3DLs2pqPw/unsubscribe?hl=en-US > . > To unsubscribe from this group and all its topics, send an email to > git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- 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] Keeping IDE files in a public project
One approach might be to keep one set of branches that have your IDE files, and one set of branches that don't. Something like: 1. remote tracking branch from the authoritative repository 2. your working branch, without IDE files 3. your working branch(es), with IDE files You work in #3. Changes can be moved from #2 to #3 can be done with ordinary merging. Changes can be moved from #3 to #2 using something like "git filter-tree" (presumably controlled by a version-controlled file that tells what to leave out). 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.
Re: [git-users] Keeping IDE files in a public project
If the open-source project's repository is a submodule of my own, wouldn't
that work?
On Sat, Mar 23, 2013 at 1:32 AM, Gergely Polonkai wrote:
> Submodules are committed with the project, so your fellow developers would
> see that they exist. Also, submodules need to be committed separately,
> while the approach I described can be automated with software like
> SparkleShare (if you don't mind that you don't control the commit messages)
>
>
> On 23 March 2013 00:28, Ram Rachum wrote:
>
>> And this will be more convenient than a submodule?
>>
>>
>> On Sat, Mar 23, 2013 at 1:24 AM, Gergely Polonkai wrote:
>>
>>> If you manage to store them in a different directory, it will be easy to
>>> manage them in a your own repository. E.g you check out the project source
>>> in /home/user/project/source from git.project.com and the IDE files to
>>> /home/user/project/ide from git.example.com, and combine them by using
>>> the IDE's powers :)
>>>
>>>
>>> On 22 March 2013 23:47, Ram Rachum wrote:
>>>
Gergerly, that doesn't solve my problem. I want the files to be saved
for me to be able to use them on any computer in which I work on the repo.
On Sat, Mar 23, 2013 at 12:39 AM, Gergely Polonkai <
gerg...@polonkai.eu> wrote:
> That depends on your IDE. E.g. Netbeans cat store the project
> ("IDE") files in a separate directory, and as I remember, Eclipse can do
> the same.
>
>
> On 22 March 2013 23:22, Ram Rachum wrote:
>
>> Hi everybody,
>>
>> Here's a problem I had to deal with many times. I'm hoping someone
>> here can come up with a solution.
>>
>> I'm working on an open-source project. I need to have a few files
>> that other people wouldn't like to see: Mostly IDE files. I don't want to
>> commit those files to the repo itself, because other developers usually
>> don't like that. However, I wouldn't like to ignore them either, because
>> I
>> want those file source-controlled for all the advantages that this
>> provides. (Great backup, versioning, etc.) I work on multiple computers
>> so
>> when I update these files on one computer, I want to be able to check
>> them
>> out on the other computer like I normally do with Git.
>>
>> How can I solve this problem? My idea is to have my own repo that
>> contains the open-source project as a submodule, but I've never tried
>> that
>> and I don't know whether it will work and be convenient to work with.
>> I'll
>> be happy to hear suggestions on what to do.
>>
>>
>> Thanks,
>> Ram.
>>
>> --
>> 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.
>>
>>
>>
>
> --
> You received this message because you are subscribed to a topic in the
> Google Groups "Git for human beings" group.
> To unsubscribe from this topic, visit
> https://groups.google.com/d/topic/git-users/xT3DLs2pqPw/unsubscribe?hl=en-US
> .
> To unsubscribe from this group and all its topics, send an email to
> git-users+unsubscr...@googlegroups.com.
>
> For more options, visit https://groups.google.com/groups/opt_out.
>
>
>
--
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.
>>>
>>> --
>>> You received this message because you are subscribed to a topic in the
>>> Google Groups "Git for human beings" group.
>>> To unsubscribe from this topic, visit
>>> https://groups.google.com/d/topic/git-users/xT3DLs2pqPw/unsubscribe?hl=en-US
>>> .
>>> To unsubscribe from this group and all its topics, send an email to
>>> git-users+unsubscr...@googlegroups.com.
>>> For more options, visit https://groups.google.com/groups/opt_out.
>>>
>>>
>>>
>>
>> --
>> 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.
>>
>>
>>
>
> --
> You received this message because you are subscribed to a topic in the
> Google Groups "Git for human beings" group.
> To unsubscribe from this topic, visit
> https://groups.google.com/d/topic/git-users/xT3DLs2pqPw/unsubscribe?hl=en-US
> .
> To unsubscribe from this group and all its topics, send an email to
> git-users+unsubscr...@googlegroups.com.
Re: [git-users] Keeping IDE files in a public project
Submodules are committed with the project, so your fellow developers would
see that they exist. Also, submodules need to be committed separately,
while the approach I described can be automated with software like
SparkleShare (if you don't mind that you don't control the commit messages)
On 23 March 2013 00:28, Ram Rachum wrote:
> And this will be more convenient than a submodule?
>
>
> On Sat, Mar 23, 2013 at 1:24 AM, Gergely Polonkai wrote:
>
>> If you manage to store them in a different directory, it will be easy to
>> manage them in a your own repository. E.g you check out the project source
>> in /home/user/project/source from git.project.com and the IDE files to
>> /home/user/project/ide from git.example.com, and combine them by using
>> the IDE's powers :)
>>
>>
>> On 22 March 2013 23:47, Ram Rachum wrote:
>>
>>> Gergerly, that doesn't solve my problem. I want the files to be saved
>>> for me to be able to use them on any computer in which I work on the repo.
>>>
>>>
>>> On Sat, Mar 23, 2013 at 12:39 AM, Gergely Polonkai >> > wrote:
>>>
That depends on your IDE. E.g. Netbeans cat store the project ("IDE")
files in a separate directory, and as I remember, Eclipse can do the same.
On 22 March 2013 23:22, Ram Rachum wrote:
> Hi everybody,
>
> Here's a problem I had to deal with many times. I'm hoping someone
> here can come up with a solution.
>
> I'm working on an open-source project. I need to have a few files that
> other people wouldn't like to see: Mostly IDE files. I don't want to
> commit
> those files to the repo itself, because other developers usually don't
> like
> that. However, I wouldn't like to ignore them either, because I want those
> file source-controlled for all the advantages that this provides. (Great
> backup, versioning, etc.) I work on multiple computers so when I update
> these files on one computer, I want to be able to check them out on the
> other computer like I normally do with Git.
>
> How can I solve this problem? My idea is to have my own repo that
> contains the open-source project as a submodule, but I've never tried that
> and I don't know whether it will work and be convenient to work with. I'll
> be happy to hear suggestions on what to do.
>
>
> Thanks,
> Ram.
>
> --
> 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.
>
>
>
--
You received this message because you are subscribed to a topic in the
Google Groups "Git for human beings" group.
To unsubscribe from this topic, visit
https://groups.google.com/d/topic/git-users/xT3DLs2pqPw/unsubscribe?hl=en-US
.
To unsubscribe from this group and all its topics, send an email to
git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
>>>
>>> --
>>> 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.
>>>
>>>
>>>
>>
>> --
>> You received this message because you are subscribed to a topic in the
>> Google Groups "Git for human beings" group.
>> To unsubscribe from this topic, visit
>> https://groups.google.com/d/topic/git-users/xT3DLs2pqPw/unsubscribe?hl=en-US
>> .
>> To unsubscribe from this group and all its topics, send an email to
>> git-users+unsubscr...@googlegroups.com.
>> For more options, visit https://groups.google.com/groups/opt_out.
>>
>>
>>
>
> --
> 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.
>
>
>
--
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] Keeping IDE files in a public project
And this will be more convenient than a submodule?
On Sat, Mar 23, 2013 at 1:24 AM, Gergely Polonkai wrote:
> If you manage to store them in a different directory, it will be easy to
> manage them in a your own repository. E.g you check out the project source
> in /home/user/project/source from git.project.com and the IDE files to
> /home/user/project/ide from git.example.com, and combine them by using
> the IDE's powers :)
>
>
> On 22 March 2013 23:47, Ram Rachum wrote:
>
>> Gergerly, that doesn't solve my problem. I want the files to be saved for
>> me to be able to use them on any computer in which I work on the repo.
>>
>>
>> On Sat, Mar 23, 2013 at 12:39 AM, Gergely Polonkai
>> wrote:
>>
>>> That depends on your IDE. E.g. Netbeans cat store the project ("IDE")
>>> files in a separate directory, and as I remember, Eclipse can do the same.
>>>
>>>
>>> On 22 March 2013 23:22, Ram Rachum wrote:
>>>
Hi everybody,
Here's a problem I had to deal with many times. I'm hoping someone here
can come up with a solution.
I'm working on an open-source project. I need to have a few files that
other people wouldn't like to see: Mostly IDE files. I don't want to commit
those files to the repo itself, because other developers usually don't like
that. However, I wouldn't like to ignore them either, because I want those
file source-controlled for all the advantages that this provides. (Great
backup, versioning, etc.) I work on multiple computers so when I update
these files on one computer, I want to be able to check them out on the
other computer like I normally do with Git.
How can I solve this problem? My idea is to have my own repo that
contains the open-source project as a submodule, but I've never tried that
and I don't know whether it will work and be convenient to work with. I'll
be happy to hear suggestions on what to do.
Thanks,
Ram.
--
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.
>>>
>>> --
>>> You received this message because you are subscribed to a topic in the
>>> Google Groups "Git for human beings" group.
>>> To unsubscribe from this topic, visit
>>> https://groups.google.com/d/topic/git-users/xT3DLs2pqPw/unsubscribe?hl=en-US
>>> .
>>> To unsubscribe from this group and all its topics, send an email to
>>> git-users+unsubscr...@googlegroups.com.
>>>
>>> For more options, visit https://groups.google.com/groups/opt_out.
>>>
>>>
>>>
>>
>> --
>> 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.
>>
>>
>>
>
> --
> You received this message because you are subscribed to a topic in the
> Google Groups "Git for human beings" group.
> To unsubscribe from this topic, visit
> https://groups.google.com/d/topic/git-users/xT3DLs2pqPw/unsubscribe?hl=en-US
> .
> To unsubscribe from this group and all its topics, send an email to
> git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>
>
>
--
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] Keeping IDE files in a public project
If you manage to store them in a different directory, it will be easy to
manage them in a your own repository. E.g you check out the project source
in /home/user/project/source from git.project.com and the IDE files to
/home/user/project/ide from git.example.com, and combine them by using the
IDE's powers :)
On 22 March 2013 23:47, Ram Rachum wrote:
> Gergerly, that doesn't solve my problem. I want the files to be saved for
> me to be able to use them on any computer in which I work on the repo.
>
>
> On Sat, Mar 23, 2013 at 12:39 AM, Gergely Polonkai
> wrote:
>
>> That depends on your IDE. E.g. Netbeans cat store the project ("IDE")
>> files in a separate directory, and as I remember, Eclipse can do the same.
>>
>>
>> On 22 March 2013 23:22, Ram Rachum wrote:
>>
>>> Hi everybody,
>>>
>>> Here's a problem I had to deal with many times. I'm hoping someone here
>>> can come up with a solution.
>>>
>>> I'm working on an open-source project. I need to have a few files that
>>> other people wouldn't like to see: Mostly IDE files. I don't want to commit
>>> those files to the repo itself, because other developers usually don't like
>>> that. However, I wouldn't like to ignore them either, because I want those
>>> file source-controlled for all the advantages that this provides. (Great
>>> backup, versioning, etc.) I work on multiple computers so when I update
>>> these files on one computer, I want to be able to check them out on the
>>> other computer like I normally do with Git.
>>>
>>> How can I solve this problem? My idea is to have my own repo that
>>> contains the open-source project as a submodule, but I've never tried that
>>> and I don't know whether it will work and be convenient to work with. I'll
>>> be happy to hear suggestions on what to do.
>>>
>>>
>>> Thanks,
>>> Ram.
>>>
>>> --
>>> 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.
>>>
>>>
>>>
>>
>> --
>> You received this message because you are subscribed to a topic in the
>> Google Groups "Git for human beings" group.
>> To unsubscribe from this topic, visit
>> https://groups.google.com/d/topic/git-users/xT3DLs2pqPw/unsubscribe?hl=en-US
>> .
>> To unsubscribe from this group and all its topics, send an email to
>> git-users+unsubscr...@googlegroups.com.
>>
>> For more options, visit https://groups.google.com/groups/opt_out.
>>
>>
>>
>
> --
> 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.
>
>
>
--
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] Keeping IDE files in a public project
Gergerly, that doesn't solve my problem. I want the files to be saved for
me to be able to use them on any computer in which I work on the repo.
On Sat, Mar 23, 2013 at 12:39 AM, Gergely Polonkai wrote:
> That depends on your IDE. E.g. Netbeans cat store the project ("IDE")
> files in a separate directory, and as I remember, Eclipse can do the same.
>
>
> On 22 March 2013 23:22, Ram Rachum wrote:
>
>> Hi everybody,
>>
>> Here's a problem I had to deal with many times. I'm hoping someone here
>> can come up with a solution.
>>
>> I'm working on an open-source project. I need to have a few files that
>> other people wouldn't like to see: Mostly IDE files. I don't want to commit
>> those files to the repo itself, because other developers usually don't like
>> that. However, I wouldn't like to ignore them either, because I want those
>> file source-controlled for all the advantages that this provides. (Great
>> backup, versioning, etc.) I work on multiple computers so when I update
>> these files on one computer, I want to be able to check them out on the
>> other computer like I normally do with Git.
>>
>> How can I solve this problem? My idea is to have my own repo that
>> contains the open-source project as a submodule, but I've never tried that
>> and I don't know whether it will work and be convenient to work with. I'll
>> be happy to hear suggestions on what to do.
>>
>>
>> Thanks,
>> Ram.
>>
>> --
>> 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.
>>
>>
>>
>
> --
> You received this message because you are subscribed to a topic in the
> Google Groups "Git for human beings" group.
> To unsubscribe from this topic, visit
> https://groups.google.com/d/topic/git-users/xT3DLs2pqPw/unsubscribe?hl=en-US
> .
> To unsubscribe from this group and all its topics, send an email to
> git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>
>
>
--
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] Keeping IDE files in a public project
That depends on your IDE. E.g. Netbeans cat store the project ("IDE") files
in a separate directory, and as I remember, Eclipse can do the same.
On 22 March 2013 23:22, Ram Rachum wrote:
> Hi everybody,
>
> Here's a problem I had to deal with many times. I'm hoping someone here
> can come up with a solution.
>
> I'm working on an open-source project. I need to have a few files that
> other people wouldn't like to see: Mostly IDE files. I don't want to commit
> those files to the repo itself, because other developers usually don't like
> that. However, I wouldn't like to ignore them either, because I want those
> file source-controlled for all the advantages that this provides. (Great
> backup, versioning, etc.) I work on multiple computers so when I update
> these files on one computer, I want to be able to check them out on the
> other computer like I normally do with Git.
>
> How can I solve this problem? My idea is to have my own repo that contains
> the open-source project as a submodule, but I've never tried that and I
> don't know whether it will work and be convenient to work with. I'll be
> happy to hear suggestions on what to do.
>
>
> Thanks,
> Ram.
>
> --
> 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.
>
>
>
--
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] Keeping IDE files in a public project
Hi everybody, Here's a problem I had to deal with many times. I'm hoping someone here can come up with a solution. I'm working on an open-source project. I need to have a few files that other people wouldn't like to see: Mostly IDE files. I don't want to commit those files to the repo itself, because other developers usually don't like that. However, I wouldn't like to ignore them either, because I want those file source-controlled for all the advantages that this provides. (Great backup, versioning, etc.) I work on multiple computers so when I update these files on one computer, I want to be able to check them out on the other computer like I normally do with Git. How can I solve this problem? My idea is to have my own repo that contains the open-source project as a submodule, but I've never tried that and I don't know whether it will work and be convenient to work with. I'll be happy to hear suggestions on what to do. Thanks, Ram. -- 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.
