Must read Get your database under version control. Check the series of posts by K. Scott Allen. When it comes to version control, the database is often a second or even third-class citizen. From what I’ve seen, teams that would never think of writing code without version control in a million years– and rightly so– … Read more
Here is my solution with git. It allows you to just add and commit (and diff) as usual: those operations will not alter your working tree, and at the same time (re)running a notebook will not alter your git history. Although this can probably be adapted to other VCSs, I know it doesn’t satisfy your … Read more
If you have a code change in your repository, and want to move it to a target repository, then: “Push” is you forcing the changes being present in the target repository (git push). “Pull” is the target repository grabbing your changes to be present there (git pull from the other repo). A “pull request” is … Read more
If you know the commit you want to return to is the head of some branch, or is tagged, then you can just git checkout branchname You can also use git reflog to see what other commits your HEAD (or any other ref) has pointed to in the past. Edited to add: In newer versions … Read more
Create a new branch using the svn copy command as follows: $ svn copy svn+ssh://host.example.com/repos/project/trunk \ svn+ssh://host.example.com/repos/project/branches/NAME_OF_BRANCH \ -m “Creating a branch of project”
In short: replace the contents of repo with the contents of repo/.git, then tell the repository that it is now a bare repository. To do this, execute the following commands: cd repo mv .git ../repo.git # renaming just for clarity cd .. rm -fr repo cd repo.git git config –bool core.bare true Note that this … Read more
You have done it correctly. The pull request will automatically update. The process is: Open pull request Commit changes based on feedback in your local repo Push to the relevant branch of your fork The pull request will automatically add the new commits to the Commits tab of the PR.
All you need to do is configure your SSH setup with multiple SSH keypairs. This link is easy to follow (Thanks Eric): http://code.tutsplus.com/tutorials/quick-tip-how-to-work-with-github-and-multiple-accounts–net-22574 Generating SSH keys (Win/msysgit): https://help.github.com/articles/generating-an-ssh-key/ Relevant steps from the first link: Generate an SSH-key: ssh-keygen -t ed25519 -C “john@doe.example.com” Follow the prompts and decide a name, e.g. id_ed25519_example_company. Copy the SSH public-key … Read more
Meld is a free, open-source, and cross-platform (UNIX/Linux, OSX, Windows) diff/merge tool. Here’s how to install it on: Ubuntu Mac Windows: “The recommended version of Meld for Windows is the most recent release, available as an MSI from https://meldmerge.org”
Another way to squash all your commits is to reset the index to master: git checkout yourBranch git reset $(git merge-base master $(git branch –show-current)) git add -A git commit -m “one commit on yourBranch” This isn’t perfect as it implies you know from which branch “yourBranch” is coming from. Note: finding that origin branch … Read more