git: can I subtree merge just a subpath of a repository? -

-

I have Remotes Foo and Bar Fu is a web application that has many directories, related to / public which contains mixed files and other directories.

The front end of the bar libraries, such as, should go to / public / bar> FU. Foo does not have any files.

This will be a piece of cake in which the subdomules or subtree merge will be. However ...

Bar tree is a mess, it has all pre-production files like PDS and FLA, and its only useful part is its / www / tools .

So, what do I want to do, merge into the / www / tools of the bar in / public / bar>, and the rest of the show < / P>

(I think it is very similar to how you have merged with a project that basically merge into your sub-section. , Do not know.)

I have successfully done this using the following commands (for your scenario Is rewritten). $ / G> $ git Remote Bar / path / to / bar $ git merge -s our - no-commit bar / master $ git read-tree - prefix = public / bar-u bar / master: Www / tools /

Great Warning! I'm still in the process of understanding how to fetch / merge from the bar, it will bring all this in one go.

The way to change my existing merger is like this: 

  $ fetch $$ git pull -x subtree = public / bar bar

It tells you that one ton files have been deleted, you can only git rm and then git commit .

I am certainly open to suggesting suggestions for pulling changes.

Since this is an old thread, I should add that I am running Git 1.7 9


Comments

Post a Comment

Popular posts from this blog

c# - ListView onScroll event -

-
I am programming a simple C # application, and I need a Scallow event on the list view. So I inherited the original ListView class created in ListviewEx witch. I found out how to locate the scroll message from WinAPI and I modified the WndProc method. Now I have this WndProc: protected override zero WndProc (Ref message message) {base.WndProc (Ref I); If (m.msg == WM_VSCROLL) {onScroll (This, New EventArgs ()); }} But the problem is, I do not know how to know about scrolling information. This data should be in wParam, but there is a LOWORD macro ++ like in C in C # and I switch to find the criteria like SB_ below, SB_ENDSCROLL, SB_PAGEUP etc. there any way Need to change the LOWORD macro from C #? Or any other way to find the necessary parameters about scrolling? You can define the WParam constants as the following: Private const int WM_HSCROLL = 0x114; Private Constant WM_VSCROLL = 0x115; Private contact int SBHOZZ = 0; Private Consultant SB_VERT = 1; Private Con...
Read more

PHP - get image from byte array -

-
I am trying to create a back-end for my mobile application. I am sending the content of an image in the body of the HTTP request (output stream) as a byte array, I want to read this stream of bytes in PHP scripts and take back an image. Can anyone tell me how can I do this? Thank you. You can obtain the request body $ body = Reading from file_get_contents ('php: // input'); What you do with that data Depending on you, you can write the data in a file as you mentioned that this is image data, you can drop the data into the object can do. Another option is to use and load the image.
Read more

Linux Terminal Problem with Non-Canonical Terminal I/O app -

-
I have a small app written in C to run on Linux. Part of the app accepts user-input from keyboard , And it uses non-canonical terminal mode so that it can respond to each keystroke. The section of the code that accepts input is a simple task that is called repeatedly in the loop: char get_input () {char C = 0; Int res = reading (input_tamille, & amp; c, 1); If (RSS == 0) 0 returns; If (res == -1) {/ * snip error handling * /} return c; } It reads a letter from the terminal if there is no input within a given time limit, (c_cc [VTIME] value in the vocabulary structure), read () 0 And get_input () is called again It all works very well, I have recently discovered that if you run this app in a terminal window, and then the app Close the terminal window without ending, the app will not exit Received, but CPU intensive launches into an infinite loop, where the read () returns 0 without waiting continued. So how can I get out of the apple if it runs from the terminal win...
Read more