...
Git detects .classpath as local changes and will not allow a "pull" “pull” while these changes are present in your working folder. One way to get around this is to stash the local changes, do the pull, then pop the stash. There is another way, however, that will not stress out Eclipse with a re-index.
By default, Git uses a bit in git metadata to determine if a file has changed. This is much more efficient than actually comparing the contents of the file.
The command...command…
| Code Block |
|---|
git update-index --assume-unchanged {myClassPathFile}
|
... … will reset that bit so that it looks like the file is unchanged. So if you issue this command for each classpath file you should never have to stash them again.
...
Note that this setting will "stick" “stick” until turned off manually, or until you re-clone the repository. So don't don’t use it on files you have changed but don't don’t want to commit yet, unless you are prepared to manually set the bit afterword.
Ignore whitespace when viewing pull requests on github
Github easter egg: add ?w=0 to diff URLs (eg a commit, compare view or pull request) to ignore whitespace
Good article on pull request best practices:
http://codeinthehole.com/writing/pull-requests-and-other-good-practices-for-teams-using-github/
...
When you're ready to submit code with a Pull Request, create a Jira case and use the case number in your commit messages, e.g. "[JIRA-1234] adding new functionality". When submitted update the Jira case with a link to the pull request on GitHub.
Advanced Topics
Advanced Git Topics - Preferred workflow, get yourself out of git trouble, and other cool stuff