shyamkkhadka

test

shyamkkhadka

== Assume you are working on branch called "mytestbranch" and now you want to commit
$ git add .
$ git commit -m "My commit message"
$ git checkout master
$ git merge mytestbranch
$ git pull --rebase
== if conflict, 
      == resolve conflict:
      $ git add .
      $ git rebase --continue

shyamkkhadka

git checkout master
git merge branchname
git pull --rebase

(If conflict, resolve conflict:
git add .
git rebase --continue
)

git push

shyamkkhadka

$ cd myproject
$ git checkout myBranch
$ git push -u origin myBranch

# In some cases -u showed as invalid argument, so use this
$ git push origin <local name>

shyamkkhadka

$ git clone git://example.com/myproject
$ cd myproject
$ git branch -a
$ git checkout -b experimental origin/experimental