You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
git status | grep "deleted by them" | awk '{print $NF}' | xargs git rm
The resulting change to main MUST include a merge commit that descends from the upstream code being brought in; it MUST NOT squash the upstream code. This will (a) result in a recent merge base for future sync merges that avoids having to re-resolve conflicts; and (b) integrate properly with cherry-picking for releases.
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
-
main
with commit hash of version to update tomain
git merge origin/auto-rename-module_...
(branch name from workflow)git checkout --ours -- .github/workflows/go.yml .golangci.yml [...]
andgit add [same files]
git status | grep "deleted by them" | awk '{print $NF}' | xargs git rm
The resulting change to
main
MUST include a merge commit that descends from the upstream code being brought in; it MUST NOT squash the upstream code. This will (a) result in a recent merge base for future sync merges that avoids having to re-resolve conflicts; and (b) integrate properly with cherry-picking for releases.Automating in #150
Beta Was this translation helpful? Give feedback.
All reactions