Skip to content

Commit

Permalink
docs(misc): fix grammar in git history doc (#10079)
Browse files Browse the repository at this point in the history
  • Loading branch information
madisonbullard committed May 6, 2022
1 parent 0ec1a62 commit cce5bfe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/shared/migration/preserving-git-histories.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ For your `package-lock.json` or `yarn.lock`, it's likely best to remove those en

For other files (think `nx.json`, `workspace.json`, `angular.json`, `package.json`, `tsconfig.base.json`, etc.) you'll need to resolve these conflicts manually to ensure that considerations for both your existing workspace and the newly added project are accounted for.

Note that for these files, the file history of the standalone project will be not be present after merging. You would see all changes from resolving conflicts in the single merge commit, and any further back would simply be the file history of your workspace.
Note that for these files, the file history of the standalone project will not be present after merging. You would see all changes from resolving conflicts in the single merge commit, and any further back would simply be the file history of your workspace.

## Using `git mv`

Expand Down

1 comment on commit cce5bfe

@vercel
Copy link

@vercel vercel bot commented on cce5bfe May 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nx-dev – ./

nx-dev-git-master-nrwl.vercel.app
nx-dev-nrwl.vercel.app
nx-five.vercel.app
nx.dev

Please sign in to comment.