linux
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revision | |||
| linux [2025/07/10 11:44] – jotasandoku | linux [2025/10/25 14:23] (current) – jotasandoku | ||
|---|---|---|---|
| Line 537: | Line 537: | ||
| git diff origin/ | git diff origin/ | ||
| # Choose to merge or rebase (I prefer rebase) | # Choose to merge or rebase (I prefer rebase) | ||
| - | git rebase | + | |
| + | | ||
| + | ! The above, rebases ‘feature’ into main. But IMPORTANT, I am still in feature and need to merge it: | ||
| + | git checkout main | ||
| + | git merge feature | ||
| | | ||
| # And if either I or somebody else makes a commit that breaks something: | # And if either I or somebody else makes a commit that breaks something: | ||
linux.txt · Last modified: by jotasandoku
Page Tools
Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Share Alike 4.0 International
