[README] Add rebasing example #855
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AbdelrahmanKhaledd
changed the title
AbdelrahmanKhaledd
force-pushed
the
rebasing_example
branch
from
de4afb1 to
473267b
Compare
certik
reviewed
Jul 31, 2022
|
Excellent, thank you! |
czgdp1807
reviewed
Jul 31, 2022
There was a problem hiding this comment.
I don’t use this approach for cleaning up my git history. I follow the steps in #783 (comment). Squashing using interactive rebase sometimes leads to messing up of git history so I do it only when its outcome is predictable for me.
|
Yep. Maybe we can add another line here, mentioning: "create a backup branch before doing this interactive rebase." |
|
We should put both approaches there, I use both. @czgdp1807's approach is what I use for a complicated history with lots of merges, since a rebase will give me conflicts, but the |
AbdelrahmanKhaledd
force-pushed
the
rebasing_example
branch
from
473267b to
cf99243
Compare
czgdp1807
reviewed
Aug 1, 2022
AbdelrahmanKhaledd
force-pushed
the
rebasing_example
branch
from
cf99243 to
2e2fc2c
Compare
certik
approved these changes
Aug 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.