heisenberg302

Responses would make more sense if people included:

- if they have done any cherry-picking - if they have done any backporting - if they have reverted any commit that made it to main - if they have ever used bi-sect

I think rebase is harder to learn than merge, but once you get used to it, it lets you have history that is easier to debug, and use without extra effort

also you can use git rerere if you need multiple goes for the rebase, it saves your conflict resolutions and applies them automatically when they occur again(you need to resolve the conflict when it happens for the first time).

I prefer rebase over merge because when merging since the commits are added to HEAD, when I add new commits after merge, I find it harder to understand what is being added with the current pull request.

One thing that annoys people when rebasing is, if you need to rebase a couple of times and also you change the commit history of current branch, you might end up solving the same "conflicts". To avoid this, you can use git rerere, this basically saves your conflict resolution, and if the same conflict is encountered, it resolves it automatically: https://mirrors.edge.kernel.org/pub/software/scm/git/docs/gi...

Another thing is if you keep commits in a clean "state", it is easier to revert a commit, when you squash or keep them messy it can make it harder to revert.

Also sometimes you decide you want to backport some change to other releases, and if commits are in a good state, it is much easier to do this.

I had an account in Wise, and I was transferring money between my accounts (all the names were same). Everything was legal but they closed my account and started replying to my emails with huge delays. I provided all the supportive documents for the transactions but they said they will keep the account closed (and according to the user agreement, it seems they can do it without providing the reason). They held significant amount of my money in the account, and it took a long time to withdraw it.

Also, if you get flagged in one of these services, they usually send your info to similar companies and they either close your account or don't let you create new accounts.