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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Teach git how to merge our CHANGELOG #3242

Merged
merged 1 commit into from Apr 17, 2018

Conversation

@deivid-rodriguez
Copy link
Contributor

commented Apr 16, 2018

馃帺 What? Why?

Just an experiment to see if we can reduce merge conflicts in our change log.

馃搶 Related Issues

馃搵 Subtasks

None.

馃摲 Screenshots (optional)

None.

@ghost ghost added the status: WIP label Apr 16, 2018
@mrcasals mrcasals merged commit e34b937 into master Apr 17, 2018
24 checks passed
24 checks passed
ci/circleci: accountability Your tests passed on CircleCI!
Details
ci/circleci: admin Your tests passed on CircleCI!
Details
ci/circleci: api Your tests passed on CircleCI!
Details
ci/circleci: assemblies Your tests passed on CircleCI!
Details
ci/circleci: budgets Your tests passed on CircleCI!
Details
ci/circleci: build_design_app Your tests passed on CircleCI!
Details
ci/circleci: build_test_app Your tests passed on CircleCI!
Details
ci/circleci: comments Your tests passed on CircleCI!
Details
ci/circleci: consultations Your tests passed on CircleCI!
Details
ci/circleci: core Your tests passed on CircleCI!
Details
ci/circleci: debates Your tests passed on CircleCI!
Details
ci/circleci: main Your tests passed on CircleCI!
Details
ci/circleci: meetings Your tests passed on CircleCI!
Details
ci/circleci: pages Your tests passed on CircleCI!
Details
ci/circleci: processes Your tests passed on CircleCI!
Details
ci/circleci: proposals Your tests passed on CircleCI!
Details
ci/circleci: sortitions Your tests passed on CircleCI!
Details
ci/circleci: surveys Your tests passed on CircleCI!
Details
ci/circleci: system Your tests passed on CircleCI!
Details
ci/circleci: upload-coverage Your tests passed on CircleCI!
Details
ci/circleci: verifications Your tests passed on CircleCI!
Details
codeclimate All good!
Details
codeclimate/diff-coverage 100% (80% threshold)
Details
codeclimate/total-coverage 98% (0.0% change)
Details
@mrcasals mrcasals deleted the friendlier_changelog_merging branch Apr 17, 2018
@mrcasals

This comment has been minimized.

Copy link
Contributor

commented Apr 17, 2018

@deivid-rodriguez after merging this, I'm still having conflicts merging #3244 and #3245 馃槥

@deivid-rodriguez

This comment has been minimized.

Copy link
Contributor Author

commented Apr 17, 2018

I read somewhere that github doesn't know yet how to respect this option, but it should prevent conflicts when rebasing branches locally... Too bad, but I guess that's something...

@mrcasals

This comment has been minimized.

Copy link
Contributor

commented Apr 17, 2018

Oh! Well, at least we gain something 馃槃

@deivid-rodriguez

This comment has been minimized.

Copy link
Contributor Author

commented Apr 18, 2018

Just tried it locally on a "conflicting" PR and it worked! Also here's another trick that works great:

on your global ~/.config/git/attributes

Gemfile.lock merge=bundler

on your ~/.config/git/config

[merge "bundler"]
  name = Resolve Gemfile.lock conflicts by running `bundle lock`
  driver = bundle lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can鈥檛 perform that action at this time.