Please se comments inline
Den lørdag den 19. oktober 2013 08.55.11 UTC+2 skrev Magnus Therning:
>
> On Fri, Oct 18, 2013 at 12:29:31PM -0700, Casper Schmidt wrote:
> > Hi there
> >
> > Being quite new to the more advanced use of Git I really need some
> > help here. I have been using the simpl
Den lørdag den 19. oktober 2013 10.01.47 UTC+2 skrev Peter J Weisberg:
>
> On Oct 18, 2013 12:29 PM, "Casper Schmidt" >
> wrote:
>
> > My question is then: Is there any way to merge multiple repositories
> into a single repository but in their own branch. I have found a few
> guidelines using
Den mandag den 21. oktober 2013 09.56.53 UTC+2 skrev Casper Schmidt:
>
>
>
> Den lørdag den 19. oktober 2013 10.01.47 UTC+2 skrev Peter J Weisberg:
>>
>> On Oct 18, 2013 12:29 PM, "Casper Schmidt" wrote:
>>
>> > My question is then: Is there any way to merge multiple repositories
>> into a sing
We have master and a second branch in our repository. We are merging from
branch to master every few days. Master has almost no new changes at this
time (other than the merge commits), development is happening entirely on
the branch.
The latest merge is failing with a merge conflict. I can fix
> From: Blake McBride
> Not sure what you mean about designed well, but in order to switch branches
> without having to do a full rebuild would involve:
>
> [lots of stuff]
I believe there are commercial systems that do this. They keep track
of the derived files and what source files they dep
I need to checkout a copy of a folder into another temporary "scratch"
folder.
For example, I have a directory
/myproject/junk
I want to checkout a previous copy of "junk into "junk_temp" so I get
/myproject/junk <- HEAD
/myproject/junk_temp <- some other rev.
I know I could just do a git chec
> From: Rik Svendsen Rose
> The folder that i want included is:
> 02 Microsoft SQL Server/xxx/MSSQL/Backup
>
>
> I have tried adding into my .gitignore folder:
>
> 02 Microsoft SQL Server/**/
> !02 Microsoft SQL Server/**/Backup
I don't think that Unix-style shell globs define "**" to mean
a
On Mon, 21 Oct 2013 07:43:15 -0700 (PDT)
Aaron Cook wrote:
> I need to checkout a copy of a folder into another temporary
> "scratch" folder.
>
> For example, I have a directory
>
> /myproject/junk
>
> I want to checkout a previous copy of "junk into "junk_temp" so I get
> /myproject/junk <- H
I would have never thought to read that thread based on the title :)
I did find something here that I think answers my question
http://stackoverflow.com/questions/4479960/git-checkout-to-a-specific-folder
On Monday, October 21, 2013 10:55:31 AM UTC-4, Konstantin Khomoutov wrote:
>
> On Mon, 21
I am sure this can be done. The problem is:
1. It would be a complex setup and may require a lot of maintenance to
keep up to date
2. It would add a whole new potential bug element. In other words, if the
setup, or how it worked, had a problem, you'd have something to debug that
would neve
You did
git cherry-pick HEAD..A
Instead of
git cherry-pick A
?
Or maybe the wrongly introduced code is around the conflict you resolved?
--
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 e
Hi Blake,
Just a quick prelude - as I didn't see anything that explicitly mentioned your
level of Git experience -
Git branching is not the same as branching in most other version control
systems.
Changing between Git branches is not normally swapping between major variants
and divergences of
Dear Philip,
Thanks for your thoughtful help. I come from the Subversion world. I
think I am beginning to get git. There are a lot of positive things about
it, and a few drawbacks. It solves many problems but doesn't do everything
- especially not the things you can't even imagine a solutio
Hi.
I have made some improved version of rebase, which I would
like to present. The git rebase is already a wonderful tool.
But, it has a number of disadvantages:
* Very poor support for merges. If I have a
diamond-shaped history, and want to change some of the
branches - I cannot do it in a
Another option might be to have a single work area, and then have several
build areas, one for each long-lived branch. Of course that only works if
you can build out-of-tree.
/M
On Oct 20, 2013 7:33 PM, "Blake McBride" wrote:
> Yes. That is what I do, and it works. The problems with it are:
>
15 matches
Mail list logo
