ptuomola commented on pull request #1925:
URL: https://github.com/apache/fineract/pull/1925#issuecomment-950106584
Another option is to do the following on your PR branch - if you want to
squash 3 commits to one, for example:
git rebase -i HEAD~x
(where x is the number of commits to include in the squash)
In the editor, mark as “f” in the first column for all the commits except
the first one you want to retain
Save editor
Now if you do git log you should only see one commit
Then do “git push -f origin” to push the new history to Github
> On 23 Oct 2021, at 10:54, FINTECHEANDO ***@***.***> wrote:
>
>
> I have done this:
>
> Fork the apache/fineract repository, then clone the fork in my local
environment
>
> Create a bug fix branch from develop
> git checkout -b FIX_FINERACT_XXYY develop
> Do the changes
> Commit the changes to the bug fix branch (being careful with the -a
parameter)
> git commit -am "YOU COMMENT (FINERACT-XXYY)"
> Commit the changes to my FORK repository
> git push
> Send the PR
> After making the PR work with the checklist, I am squashing the fixes into
development branch in my local repository
> git checkout develop
> git merge --squash FIX_FINERACT_XXYY develop
> git commit -am "YOU COMMENT (FINERACT-XXYY)"
> Commit the changes to my FORK repository
> git push
> —
> You are receiving this because you commented.
> Reply to this email directly, view it on GitHub
<https://github.com/apache/fineract/pull/1925#issuecomment-950045803>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AASJVCQXJMHGE7RHHBDHHZ3UIIPUTANCNFSM5GRB425Q>.
> Triage notifications on the go with GitHub Mobile for iOS
<https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675>
or Android
<https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.
>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
