Skip to content
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.

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

Introduce .gitattributes; normalize files. #163

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

Conversation

ewhac
Copy link
Contributor

@ewhac ewhac commented Jan 24, 2023

Now that FTE has made the transition from Subversion to Git, use a .gitattributes file to handle newline conversions between different platforms. Normalize all relevant text files.

To normalize your local working copy:

  • Ensure you have a clean working tree (git stash can help here),
  • git pull to this commit.
  • Delete all files in your working copy (except for .git* files),
  • git checkout -- . This will re-populate your working copy from the git repo with newlines appropriate for your platform.

See gitattributes(7) for more details.

Now that FTE has made the transition from Subversion to Git, use a
.gitattributes file to handle newline conversions between different
platforms.  Normalize all relevant text files.

To normalize your local working copy:
  - Ensure you have a clean working tree (`git stash` can help here),
  - `git pull` to this commit.
  - Delete all files in your working copy (except for .git* files),
  - `git checkout -- .`  This will re-populate your working copy from
    the git repo with newlines appropriate for your platform.

See gitattributes(7) for more details.
Help keep unwanted files/directories from being considered for checkin.
@Xylemon Xylemon added the enhancement New feature or request label Jul 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants