Jeff King <peff@xxxxxxxx> writes: > On Thu, Mar 19, 2009 at 06:17:15PM -0700, andholt wrote: > >> I have a lot of local changes to add, commit, and push. Right now our >> directory structure is 1/2/3. Another developer decided to move everything >> up one level, so used git move to move 3 to 2, and removed 3, so now the >> level is 1/2. However, locally, all of my changes are in 1/2/3. >> >> I want to commit my changes and merge them into the new directory structure. >> How would I go about doing that? > > First, commit your changes. Then merge the other developer's changes. :) We should probably point out to new people that "first commit and then worry about merges after your changes are safely committed" is always how people would "go about" anything. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
