search

coyote-team / coyote-drupal

0 stars 0 forks source link

main to this branch #19

Closed catorghans closed 1 year ago

catorghans commented 1 year ago

First pull request from main to this branch. Then the other way around.

jkva commented 1 year ago

Why would you not rebase your branch onto origin/main instead?

catorghans commented 1 year ago

Possible, but I don't like changing the history of git branches. It feels contrary to why you use git in the first place.

jkva commented 1 year ago

Agreed when it comes to the main branch. When it's a branch that only you work on? Rebase and force push. Alternatively, git pull and fast-forward. Pull requests from main into feature branches is a smell.

catorghans commented 1 year ago

ok, will close this PR and do

git fetch git rebase origin/master

within this branch