Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
development:git:start [2020/07/27 11:02] kalenpw [Branches and Merging] |
development:git:start [2021/07/01 10:24] (current) kalenpw |
||
|---|---|---|---|
| Line 15: | Line 15: | ||
| - '' | - '' | ||
| - '' | - '' | ||
| + | |||
| + | ---- | ||
| + | ===== Replace one branch with another ===== | ||
| + | Useful if working on complete overhauls in a separate branch | ||
| + | <code bash> | ||
| + | git checkout better_branch | ||
| + | git merge --strategy=ours master | ||
| + | git checkout master | ||
| + | git merge better_branch | ||
| + | </ | ||
| ---- | ---- | ||
| Line 34: | Line 44: | ||
| git remote set-url origin git@github.com: | git remote set-url origin git@github.com: | ||
| </ | </ | ||
| + | ---- | ||