Because the whole point of the gradle wrapper is to be able, without having ever installed gradle, and without even knowing how it works, where to download it from, which version, to clone the project from the VCS, to execute the gradlew script it contains, and to build the project without any additional step. If … Read more
Anytime I complete a “full thought” of code that compiles and runs I check-in. This usually ends up being anywhere between 15-60 minutes. Sometimes it could be longer, but I always try to checkin if I have a lot of code changes that I wouldn’t want to rewrite in case of failure. I also usually … Read more
Say you and your friend both checked out a file, and made some changes to it. You removed a line at the beginning, and your friend added a line at the end. Then he committed his file, and you need to merge his changes into your copy. If you were doing a two-way merge (in … Read more
How do you configure it to ignore files? Ignore is configured in a normal text file called .hgignore in the root of your repository. Add it just like a normal file with: hg add .hgignore There are two syntax options available for file matching, glob and regexp. glob is unix-like filename expansion and regexp is … Read more
Here’s the cheat sheet on the commands: hg update changes your working copy parent revision and also changes the file content to match this new parent revision. This means that new commits will carry on from the revision you update to. hg revert changes the file content only and leaves the working copy parent revision … Read more
Right click on the commit you like to reset to (not the one you like to delete!) Select “Reset master to this commit” Select “Soft” reset. A soft reset will keep your local changes. Source: https://answers.atlassian.com/questions/153791/how-should-i-remove-push-commit-from-sourcetree Edit About git revert: This command creates a new commit which will undo other commits. E.g. if you have … Read more
KDiff3 open source, cross platform Same interface for Linux and Windows, very smart algorithm for solving conflicts, regular expressions for automatically solving conflicts, integrate with ClearCase, SVN, Git, MS Visual Studio, editable merged file, compare directories Its keyboard-navigation is great: ctrl-arrows to navigate the diffs, ctrl-1, 2, 3 to do the merging. Also, see https://stackoverflow.com/a/2434482/42473
‘hg forget‘ is just shorthand for ‘hg remove -Af‘. From the ‘hg remove‘ help: …and -Af can be used to remove files from the next revision without deleting them from the working directory. Bottom line: ‘remove‘ deletes the file from your working copy on disk (unless you uses -Af) and ‘forget‘ doesn’t.
Update: Mercurial has added –amend which should be the preferred option now. You can rollback the last commit (but only the last one) with hg rollback and then reapply it. Important: this permanently removes the latest commit (or pull). So if you’ve done a hg update that commit is no longer in your working directory … 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