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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Document empty commit technique to allow merge commits on already merged branches #11

Open
rocketraman opened this issue Feb 26, 2020 · 0 comments
Labels
docs enhancement New feature or request good first issue Good for newcomers

Comments

@rocketraman
Copy link
Owner

In some cases, a branch may be merged into an integration branch as part of another topic. Generally, one should explicitly merge in dependent branches first, but in some cases this does not happen.

If so, sometimes it is useful to document the merge of that branch in the first-parent log. However, git will refuse to merge the branch because it will report "Already up to date".

We should document the use of empty commits on the topic branch, that will allow git to merge the topic into an integration branch, despite it already being there via another topic.

@rocketraman rocketraman added docs good first issue Good for newcomers enhancement New feature or request labels Feb 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs enhancement New feature or request good first issue Good for newcomers
Projects
None yet
Development

No branches or pull requests

1 participant