you can git cherry-pick bada553d if it’s just the one commit. You can also reference anywhere you’ve been by using the reflog: git reflog then use one of those commits: git checkout -b temp HEAD@{3} to checkout and make a branch temp from where your current commit was 3 “times” ago. It’s a bread crumb … 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
Sure: svn rm the unwanted folder, and commit. To avoid this situation in the future, I would follow the recommended layout for SVN projects: Put your code in the /someproject/trunk folder (or just /trunk if you want to put only one project in the repository) Created branches as /someproject/branches/somebranch Put tags under /someproject/tags Now when … Read more
From Visual Studio, open Source Control Explorer: View | Team Explorer Select your Team Project from Team Explorer, expand it, and double click Source Control In the left-hand pane of Source Control Explorer, select your Team Project. In the right-hand pane, find your mainline branch, right-click and select Merge… In the Target branch drop-down, select … Read more
There’s no problem in deleting branches that have been merged in. All the commits are still available in the history, and even in the GitHub interface, they will still show up (see, e.g., this PR which refers to a fork that I’ve deleted after the PR got accepted).
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
git pull is probably creating the commit. If you make a local commit and then run git pull after someone else pushes a commit up to the repository, Git downloads the other developer’s commit and then merges it into your local branch. How to avoid these merge commits in the future You could use git … 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
My easy click-by-click instructions (specific to TortoiseSVN) are in Stack Overflow question What is the simplest way to do branching and merging using TortoiseSVN?.
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