Skip to content

Update FAQ #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shreyasgm wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update FAQ #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69d3af7
Update FAQs.md
Apr 9, 2016
ae4acaf
Merge pull request #1 from shreyasgm/update-faq
Apr 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions resources/FAQs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ Commmon questions
Amending a previous commit message
----------------------------------

*Nothing has been written.*
Refer [*Changing a Commit Message*](https://help.github.com/articles/changing-a-commit-message/).

If the commit has not yet been pushed to GitHub, `git commit --amend -m "<new commit message>"` will amend the previous commit message locally. If the commit has already been pushed online, however, you will have to first amend the commit locally as before, and then force push the amended commit to GitHub using `git push --force`. Note that this will change your repository's history.

Dealing with merge conflicts
----------------------------

*Nothing has been written.*
If a commit (by someone else) on the GitHub repository has changed the same line in a file that you are editing, you will need to [resolve merge conflicts using the command line](https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/).

Pushing/pulling problems
------------------------
Expand All @@ -19,7 +21,7 @@ Pushing/pulling problems
Expanding the size of a repository
----------------------------------

*Nothing has been written.*
[Quotas on GitHub](https://help.github.com/articles/what-is-my-disk-quota/)

Stashing changes
----------------
Expand All @@ -29,9 +31,9 @@ Stashing changes
Ignoring certain files (`.gitignore`)
-------------------------------------

### `.gitignore` for Stata projects
`.gitignore` is a text file that tells git the files (or patterns of files) that git should not track changes to. For example, intermediate files created by running your do files/scripts might not need to be tracked.

Blacklist vs. whitelist
You can find typical `.gitignore` file contents for your projects at [gitignore.io](https://www.gitignore.io)

Creating a GitHub repository from an existing Box/Dropbox folder
----------------------------------------------------------------
Expand Down