This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Add .gitattributes tip to the Javascript guide #201

Merged

ryanhofdotgov merged 1 commit into main from mgwalker/gitattributes

Sep 23, 2020

Member

mgwalker commented Sep 23, 2020

fixes links in the JS doc (they were links with no hrefs, so they didn't render anything)
adds some words about configuring git and GitHub to ignore package-lock.json when doing diffs by setting up a .gitattributes file
also adds some words about using npm-merge-driver to automatically resolve package-lock.json merge conflicts


          add gitattributes tip

bbc7b0e

ryanhofdotgov self-requested a review

September 23, 2020 15:43

ryanhofdotgov approved these changes

View reviewed changes

Contributor

ryanhofdotgov left a comment

Nice!

ryanhofdotgov merged commit 716cd53 into main

mgwalker deleted the mgwalker/gitattributes branch

September 23, 2020 16:09

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet