User Tools

Site Tools

Trace:
git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revisionBoth sides next revision
git [2022/07/12 10:45] – Added --set-upstream-to then pull instead of rebase dblumegit [2022/07/12 10:47] – [Fixing a bug in its own branch in Roku Firmware] dblume
Line 165: Line 165:
 Instead of doing a rebase before commit, stash your changes, set the upstream to origin/main, do a pull, unstash the change, then commit and push -f upstream to the branch. Kind of like this: Instead of doing a rebase before commit, stash your changes, set the upstream to origin/main, do a pull, unstash the change, then commit and push -f upstream to the branch. Kind of like this:
  
-    git stash push -m "hold for pull" +<code bash> 
-    git branch --set-upstream-to origin/main +git stash push -m "hold for pull" 
-    git pull +git branch --set-upstream-to origin/main 
-    git stash pop (restores stash on top of main) +git pull 
-    git add/commit +git stash pop (restores stash on top of main) 
-    git push -f origin <branchname> +git add/commit 
 +git push -f origin <branchname> 
 +</code>
 ====== git at dlma.com ====== ====== git at dlma.com ======
  
git.txt · Last modified: 2024/04/11 16:58 by dblume