On Monday, October 7, 2013 5:44:33 PM UTC+2, Paulo Matos wrote:
Hi,
I am seeing an unexpected effect of cherry-picking.
I have two branches master and feature where feature branched off master
awhile ago.
I commit patch A to feature (in this case it was to Makefile.in) and then
I
On Wednesday, October 9, 2013 11:16:38 PM UTC+2, cko wrote:
hello people,
I am currently working on a GIT workflow that is supposed to do the
following:
- there is one central repository named puppet - hosted on gitlab
- the repository is supposed to have three fixed branches:
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 kalle@gmail.comjavascript:
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
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 kalle@gmail.com wrote:
My question is then: Is there any way to merge multiple repositories
into a
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
From: Blake McBride blake1...@gmail.com
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
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 checkout
From: Rik Svendsen Rose rik.s.r...@gmail.com
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 **
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
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
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
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 blake1...@gmail.com wrote:
Yes. That is what I do, and it works. The
14 matches
Mail list logo
