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.

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

Jump to bottom

Git #168

Open
coryhouse opened this issue May 15, 2023 · 0 comments
Open

Git #168

coryhouse opened this issue May 15, 2023 · 0 comments

Comments

@coryhouse
Copy link
Owner

coryhouse commented May 15, 2023 •
edited
Loading

Git tips

  • To avoid merge conflicts on a file that has many changes on the same lines, use a union merge strategy by creating .gitattributes, and putting this inside: CHANGELOG.md merge=union (this assumes the file is called CHANGELOG.md). Example. Or, try Towncrier
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@coryhouse