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

Discuss and document GitHub merge strategies #172

Closed
1 of 2 tasks
EwoutH opened this issue Sep 19, 2022 · 1 comment · Fixed by #200
Closed
1 of 2 tasks

Discuss and document GitHub merge strategies #172

EwoutH opened this issue Sep 19, 2022 · 1 comment · Fixed by #200
Assignees
@EwoutH
Labels
maintenance
Milestone
2.3.0

Comments

@EwoutH
Copy link
Collaborator

EwoutH commented Sep 19, 2022 •
edited
Loading

Merge commits are ugly and I don't like them (see screenshot below). Luckily there are other options on merging PRs with don't creates this noise in the Git log (which I secretly applied when merging #162 for example). There are some nitpicks however, so we should discuss this on our next meeting.

Screenshot_12
@EwoutH EwoutH added this to the 2.3.0 milestone Sep 19, 2022
@EwoutH EwoutH self-assigned this Sep 19, 2022
@EwoutH
Copy link
Collaborator Author

EwoutH commented Sep 19, 2022

Note to self:

  • git merge --ff-only
  • atomic, linear commit strategy
  • Single commit Squash via GitHub UI, multi-commit via CLI (then put PR nummer in commits)

@EwoutH EwoutH mentioned this issue Oct 23, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@EwoutH EwoutH

Labels
maintenance
Projects
None yet
Milestone
2.3.0
Development

Successfully merging a pull request may close this issue.

Update Contributing.md with instructions how to merge PRs quaquel/EMAworkbench
1 participant
@EwoutH