WARNING: a “dummy merge”, as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to — you will not see the changes. Or … Read more
Git is resolving the cherry-pick as a no-op — all of the changes introduced by that commit have been introduced by some commit on your current branch. (Or that’s what Git thinks, anyway.) Verify that the commit you are cherry-picking hasn’t already been merged somehow, as either a proper merge, rebase/cherry-pick, or piecemeal patch. (Use … Read more
How I would do this git checkout master git pull origin master git merge test git push origin master If I have a local branch from a remote one, I don’t feel comfortable with merging other branches than this one with the remote. Also I would not push my changes, until I’m happy with what … Read more
The issue is that, even though you removed the files, they are still present in previous revisions. That’s the whole point of git, is that even if you delete something, you can still get it back by accessing the history. What you are looking to do is called rewriting history, and it involved the git … Read more
Use git cherry-pick <commit> to apply <commit> to your current branch. I myself would probably cross-check the commits I pick in gitk and cherry-pick them with right-clicks on the commit entry there instead. If you want to go more automatic (with all its dangers) and assuming all commits since yesterday happened on wss you could … Read more
Phew, haven’t used SVN in a while… 🙂 But from what I can remember Branch locations should be the folder containing your branches folders (and not each individual branch folder). You see, typically a SVN repo follows a standard naming convention and folder structure: trunk/ branches/ Feature_A2/ Feature_A3/ tags/ v1.01/ v1.02/ and so on… trunk … Read more
How I would do this git checkout master git pull origin master git merge test git push origin master If I have a local branch from a remote one, I don’t feel comfortable with merging other branches than this one with the remote. Also I would not push my changes, until I’m happy with what … Read more
Run this from the branch where you want the file to end up: git checkout otherbranch myfile.txt General formulas: git checkout <commit_hash> <relative_path_to_file_or_dir> git checkout <remote_name>/<branch_name> <file_or_dir> Some notes (from comments): Using the commit hash, you can pull files from any commit This works for files and directories Overwrites the file myfile.txt and mydir Wildcards … Read more
Update 2019: These days, the question would be seen in a context using Git, and 10 years of using that distributed development workflow (collaborating mainly through GitHub) shows the general best practices: master is the branch ready to be deployed into production at any time: the next release, with a selected set of feature branches … Read more
You could merge your upstream branch to your dev branch, with a custom merge driver “keepTheirs”: See ““git merge -s theirs” needed — but I know it doesn’t exist”. In your case, only one .gitattributes would be required, and a keepTheirs script like: mv -f $3 $2 exit 0 git merge –strategy=theirs Simulation #1 Shows … Read more