-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Fixes #1272 #1372
Fixes #1272 #1372
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@BubuDavid Thanks for the change
@alerque Would you mind reviewing this PR?
Hello @BubuDavid, I would like to go ahead and merge this PR. Can you rebase your work to the current version of the master? |
@rzvxa This doesn't need rebasing, you can merge with the "rebase and merge" option to get linear history while keeping the commits from the PR intact or "squash and merge" if the PR has messy commit history but is overall a small single-purpose set of changes. You only really need to rebase inside a PR if there are going to be merge conflicts or some testing/review is proving hard to do on an old branch point. |
@alerque I couldn't access the rebase and merge because of the fork being out of date, Should I use merge commits for updating them if I do want to keep the original commits intact? Because rebase and update changed the original commits |
Since this one is already rebased and also original author is kept intact I'm going to move forward with merging it, But I want to know if the right way is doing the merge commit instead. I don't like it when commits get changed, And I wasn't aware of the fact that GitHub doesn't respect the original commit author information, Since most of my work is in a closed source environment it wasn't an issue for me until now. I would love it if you could tell me how to update a branch in GitHub PR without changing the commits and ideally without any additional merge commit on top, Until I find out more about it I'm going to use merge commit since it won't rewrite the commits in the fork even tho I'm not a big fan of merge commits for small changes like this. (For more complex changes it makes sense to me since you get merge conflicts, But a one-file change where it's only behind by a commit is pretty obvious that won't have any conflicts) |
Description of Changes
Closes #1272
New Version Info
Author's Instructions
MAJOR.MINOR.PATCH
version number. Increment the:MAJOR
version when you make incompatible API changesMINOR
version when you add functionality in a backwards-compatible mannerPATCH
version when you make backwards-compatible bug fixesCollaborator's Instructions