User Tools

Site Tools

Trace:
todo-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
todo-git [2017/03/10 10:50] – [Renaming branches] dblumetodo-git [2017/03/10 23:31] – [Renaming branches] dblume
Line 101: Line 101:
 ====== Renaming branches ====== ====== Renaming branches ======
  
-To rename a remote branch (where "origin" is the name of the remote repo):+To rename a remote branch:
  
   - Rename the local one.   - Rename the local one.
Line 115: Line 115:
 </code> </code>
  
-Now I should see "remotes/origin/roku_dev" gone, and "remotes/origin/SDK_4.2.P2_Roku" appear. 
- 
-I still have a local branch called "roku_dev" and it's set to track  "remotes/origin/roku_dev".  Since "remotes/origin/roku_dev" is no longer there, if I try "git pull" on that branch it will say remote reference doesn't exist. 
- 
-Since I don't have any changes on that local branch that I haven't pushed up to the server before the name change, I can safely delete this local branch, and create a new local branch from "remotes/origin/SDK_4.2.P2_Roku". 
  
 ==== Changing a local branch without regard to remote branch ==== ==== Changing a local branch without regard to remote branch ====