I have looked at multiple questions and none seem to match what I am trying to do.  I started down the path of dump, filter, load but that didn't seem right.  Move may do it but it doesn't feel right since I am combining and versions seem like they will be over-written.     My current structure looks like:  /REPO      /Project_1            /trunk            /branches            /tags      /Project_2           /trunk           /branches           /tags      /Project_3          /trunk          /branches          /tags     I would like to move them into a structure that looks like  /REPO_NEW      /trunk           /Project_1           /Project_2           /Project_3      /branches           /Project_1           /Project_2           /Project_3      /tags           /Project_1           /Project_2           /Project_3   I would like to preserve the history once the restructuring is complete.  The brute force appraoch of disconnecting everything and redoing my directory/file structure and then commiting into the new repository if my absolute fallback as history is lost.
72249
After considering the answers to my previous question (), I've decided to take the 4 or so repositories I have and consolidate them into one. This of course leads to the question, what's the best way to do this?  Is there a way to combine two or more repositories maintaining the version history for both?  Edit: I should also point out that I'm using Assembla.com, which does not provide access to the svnadmin command, AFAIK  Another edit: Does this even matter? If svnadmin works on URLs, then it's no problem then.
8600
I've been using Git on Windows (msysgit) to track changes for some design work I've been doing.  Today I've been working on a different PC (with remote repo brian) and I'm now trying to merge the edits done today back into my regular local version on my laptop.  On my laptop, I've used git pull brian master to pull the changes into my local version. Everything was fine apart from the main InDesign document - this shows as a conflict.  The version on the PC (brian) is the latest one that I want to keep but I don't know what commands tells the repo to use this one.   I tried directly copying the file across onto my laptop but this seems to break the whole merge process.  Can anyone point me in the right direction?
106368
The question is simple: I cannot understand the  data structure.  My question is related to its uses with a Tree.  I want to understand how can I change the tree node using zipper. And how not to copy the whole tree (or the most part of it).  Please, clarify if I'm wrong with zipper. Maybe it cannot help with the tree update? Or, maybe, it is possible to update the tree and I just cannot see the way?
1418
I have made some changes to a file which has been committed a few times as part of a group of files, but now want to reset/revert the changes on it back to a previous version.   I have done a git log along with a git diff to find the revision I need, but just have no idea how to get the file back to its former state in the past.
20019
I'm using Git on a new project that has two parallel -- but currently experimental -- development branches:  master: import of existing codebase plus a few modifications that I'm generally sure of exp1: experimental branch #1 exp2: experimental branch #2  exp1 and exp2 represent two very different architectural approaches. Until I get further along I have no way of knowing which one (if either) will work. As I make progress in one branch I sometimes have edits that would be useful in the other branch and would like to merge just those. What is the best way to merge selective changes from one development branch to another while leaving behind everything else? Approaches I've considered:  git merge --no-commit followed by manual unstaging of a large number of edits that I don't want to make common between the branches.  Manual copying of common files into a temporary directory followed by git checkout to move to the other branch and then more manual copying out of the temporary directory into the working tree.  A variation on the above. Abandon the exp branches for now and use two additional local repositories for experimentation.  This makes the manual copying of files much more straightforward.   All three of these approaches seem tedious and error-prone.  I'm hoping there is a better approach; something akin to a filter path parameter that would make git-merge more selective.
40848
Archiving of papers and projects is very important for most of the people, and everyone has a method of it.   I, personally, try to have different folders for different papers. In the folder of each paper, in addition to my manuscript, I keep my simulation files, experimental data, program codes, etc, in different subfolders. Also, I try to keep track of my revisions on the paper, reviewer comments, my response to reviewers in different subfolders. My method has the advantage of all the related material for a paper are together, and I can quickly track the whole process from initial submission to the final proofreading. However, this usually leads to duplicated files.   I work with both my office desktop and my personal Laptop. I transfer my files between these systems by a flash memory. I agree maybe cloud technology is a better choice in this age, but I postponed it because of my poor internet connection at home.  I am curious to know how others approach to archive their works. I also hope to find some methods more efficient than mine, or get some tips to improve my method.  Edit at 2 Apr 13: Thanks to these great answers, it is almost a month that I use Git for my version control. Also, I manage my repositories in the , which gives me unlimited storage for unlimited number of projects.
71262
I'm not a git master, but I have been working with it for some time now, with several different projects.  In each project, I always git clone [repository] and from that point, can always git pull, so long as I don't have outstanding changes, of course.  Recently, I had to revert to a previous branch, and did so with git checkout 4f82a29.  When I was again ready to pull, I found that I had to set my branch back to master.  Now, I can not pull using a straight git pull but instead, have to specify git pull origin master, which is annoying, and indicates to me that I don't fully understand what is going on.  What has changed which does not allow me to do a straight git pull without specifying origin master, and how to I change it back?  UPDATE:  -bash-3.1$ cat config [core]     repositoryformatversion = 0     filemode = true     bare = false     logallrefupdates = true [branch "master"] [remote "origin"]     url = git@github.com:user/project.git     fetch = refs/heads/*:refs/remotes/origin/*   UPDATE 2: To be clear, I understand that my original method may have been incorrect, but I need to fix this repo so that I can simply use git pull again.  Currently, git pull results in:  -bash-3.1$ git pull You asked me to pull without telling me which branch you want to merge with, and 'branch.master.merge' in your configuration file does not tell me either.  Please name which branch you want to merge on the command line and try again (e.g. 'git pull  '). See git-pull(1) for details on the refspec.  If you often merge with the same branch, you may want to configure the following variables in your configuration file:      branch.master.remote =      branch.master.merge =      remote..url =      remote..fetch =   See git-config(1) for details.   I can tell git pull which branch to merge, and it works correctly, but git pull does not work as it did originally before my git checkout.
74297
This conundrum is caused by running git pull from root.   There are various reasons for me to do so... I want my device to update code when booting up, and rc.local is run by root.  It all works mostly fine (npm install tends to fail when run by root, but that's a whole 'nother topic), the problem arises when I try to use the git repository with a non-root user afterward... some of the git files have been written by root, so now I can't use it anymore (permission denied).   So I'd like to recursively chown it back but there doesn't seem to be anything that really works on all of the little git files. I tried the -R flag and ./**/* path.  My guess is that neither of those techniques descend into dot-directories.
32040
Has anyone had any success connecting things like content builder or cloud pages to GitHub? I have been searching far and wide and have come across this amazing repository that almost does what I need (). The reason being as our organization grows and things become more complex we would love the ability to track changes and have reviewers before things are published. Most of my experience comes from GitHub and I am struggling to find any source of versioning within SFMC. Any recommendations would be helpful!
80352
Possible Duplicates:             I thought that all operating systems would merge folder content when being moved to the same location. Imagine my surprise when that didn't happen and I have hundreds, if not thousands of files that have gone missing and are nowhere to be found.  Because they were not "deleted" they are not in the trash bin.  I've tried to do some recovery using a program called stellarPheonix but after about a 24hour scan, it didn't recognize any of the raw files (.dng,.arw) as image files and so I couldn't see if they could be recovered. It also didn't show the directory structure, which would be handy.  I tried a quick scan, but all it showed was files that were still on the HD, not sure what the point of that is.  I've used recover 2000 on Win and it does a good job, does anyone know of anything that works quickly and reliably for this kind of file recovery. (I don't think I should have to do a sector-by=sector for this kind of file loss)
109924
I need to ask a question about project layout, git repository structure, and IDE settings for the given scenario.  There really won't be a right answer, but rather, an answer which works best for my situation.  What is the best site to ask these types of questions so they don't get closed/locked?  Being more specific: I have a grails project that is comprised of several plugins that are basically modules for a grails app.  We're getting ready to make a move from svn to git and I want to make sure I have a good structure going forward. Right now, all the plugins and the app site in one repository.  I want to know if they should be broken up and then I have some additional questions about setting that scenario up in my IDE if that is the way to go, given different git repos for a single project.
27687
Suppose you have a history containing the three commits A, B and C:  A-B-C   I would like to combine the two commits A and B to one commit AB:  AB-C   I tried  git rebase -i A   which opens up my editor with the following contents:  pick e97a17b B pick asd314f C   I change this to  squash e97a17b B pick asd314f C   Then Git 1.6.0.4 says:  Cannot 'squash' without a previous commit   Is there a way or is this just impossible?
59679
I committed a bunch of files (dozens of files in different folders) by accident. What is the easiest, cleanest (and safest!) way to 'undo' that commit without having to delete the files from my working directory?
57241
Here's the scenario:  2 document libraries Both contain multiple documents The documents have multiple versions  When I copy a document from library A to Library B using the Content and Structure tool from Site Settings, my versions do not carry over. I'm trying to merge the two document libraries into one, but I want to retain the versions. Do you know of a way to complete this without third party tools or custom code? I've heard suggestions of using Explorer View copy and paste, SharePoint Designer and List Templates, but I'm not sure any of those will carry version info. Modern solution For modern SharePoint experiences, use Move To. Update 4/24/2018: There's a new solution in Office 365. You can now select a file or group of files in the modern experience in OneDrive or SharePoint and select Move to. A file or group of files moved this way will retain version history. Update 6/6/2021: As @KJH mentioned in a comment, you may not see the modern experience unless you . Also, there's more detail now in the Microsoft article .
87486
This doesn't work:  tar xf /tmp/foo.tar.gz foo/bar tar: foo/bar: Not found in archive   It's not obvious to me what would do this beyond extracting it in place and moving the files over.
110945
I moved a drupal installation from one server to another. Steps I followed:   Copied whole directory structure from old server. Exported database from old server. added files to newdomain/drupal Imported database edited settings.php with new database information.   As of right now the home page is working (Except for some broken non-db images, but I know the reason for that and can fix it) But none of the links to any of the nodes or any of the admin paths I know seem to exist. I get a 404 File Not Found error.   I wonder if it's related to the fact that this installation is in a subdirectory and the other one was not, but is that enough to make every page except the homepage not function?
64013
I am migrating a client's SourceSafe repository (3 projects) to SVN and two of the projects share source files.  (These projects are separate products - with different names and release versions, etc)  Has SVN resolved this shortcoming?  How do people generally handle this scenario?  Of the options I know about/can think of   Use the external or extern or whatever for SVN.  I hear this is not a good option for various reasons Create a new project (maybe called shared) that contains the source.  The problem with this is that we still have to get that code (it is not a library) and import it into the project somehow.  It can be shown to be the same problem as the one above and it introduces the overhead of an additional product/project. Just check in the files in both repositories and cross-update them.  This requires developers to know about the sharing and to remember to check in.  I suppose I could write a script that checks all known shared files and updates them when needed. Have one repository for the two projects that share.  This leaves me with the problem having to create a top level project/repository that contains the two and it is a problem for labeling.  I do not really want to label the top pseudo project.  (the tags, trunk and branch things are not exactly where I would want them.)   I will probably go with the last option.  Any other comments?