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 <wor...@alum.mit.edu> 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.


Reply via email to