Differences

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

--- development:git [2020/03/16 11:40]
kalenpw [Branches and Merging]
+++ — (current)
@@ Line 1: / Line 1: @@
-====== Git ======
-----
-===== Branches and Merging =====
-  - ''git checkout -b development'' or whatever your branch name is
-  - make your changes in development branch
-  - ''git add .''
-  - ''git commit -m "developed feature x"''
-  - ''git push origin development''
-  - when ready to merge, still on dev branch
-  - ''git merge master'' should be clean, but gives you an opportunity to fix it
-  - ''git checkout master'' should be clean again since we did above fix
-  - ''git merge development %%--%%no-ff''
-  - ''git push''
-----
-===== Multi line commit =====
-<code bash>
-git commit -m "Line one" -m "line two" -m "etc"
-</code>
-----
-===== push to repo other than origin =====
-<code bash>
-git push --no-verify --mirror git@github.com:isuwebcom/Work
-</code>
-----
-===== Change Origin =====
-<code bash>
-# useful for when repo is set to use https
-git remote set-url origin git@github.com:kalenpw/repo.git
-</code>