Home | About | Sematext search-lucene.com search-hadoop.com
 Search Hadoop and all its subprojects:

Switch to Plain View
Accumulo >> mail # dev >> GIT


+
Christopher 2013-05-21, 21:44
+
John Vines 2013-05-21, 21:51
+
Corey Nolet 2013-05-21, 22:06
+
David Medinets 2013-05-21, 22:05
+
Christopher 2013-05-21, 22:12
+
Benson Margulies 2013-05-21, 22:25
+
Mike Drob 2013-05-21, 22:25
+
Mattmann, Chris A 2013-05-21, 22:28
+
Benson Margulies 2013-05-21, 22:29
+
Michael Wall 2013-05-21, 23:32
+
Keith Turner 2013-05-22, 14:32
+
Billie Rinaldi 2013-05-22, 14:40
+
Josh Elser 2013-05-22, 14:57
+
David Medinets 2013-05-23, 00:42
+
John Vines 2013-05-23, 00:47
+
Jason Trost 2013-05-23, 12:23
+
Josh Elser 2013-05-23, 13:08
+
Christopher 2013-05-23, 15:40
The steps I follow to integrate my branches with master. It's just for
illustrative purposes. More experienced git users may want to use a
different sequence or naming conventions.

git checkout -b <name>/<date>/<ticket>/<description>
# push tracking branch back to origin so people know you are working.
git push origin <branch_name>:<branch_name> -u
# develop, commit to local branch.

git checkout master
git pull   # get changes

# create a local safety branch of master .. if something goes wrong, just
delete it and start again from this point.
git checkout -b INTEGRATION_<branch_name>
# merge your changes into the safety branch.
git merge <branch_name> --no-ff
git checkout master
git merge INTEGRATION_<branch_name>
mvn clean test
git push
+
Jason Trost 2013-05-26, 18:54
+
Billie Rinaldi 2013-05-26, 19:15
+
David Medinets 2013-05-22, 00:25
+
Josh Elser 2013-05-21, 22:27
+
Christopher 2013-06-01, 20:28
+
Jason Trost 2013-06-02, 17:54
+
Josh Elser 2013-06-04, 13:07
+
Drew Farris 2013-06-05, 02:05
+
Benson Margulies 2013-06-05, 02:24
+
Josh Elser 2013-06-05, 02:16
+
Benson Margulies 2013-06-05, 02:26
+
Sean Busbey 2013-06-05, 02:46
+
Christopher 2013-06-05, 03:35
+
Josh Elser 2013-06-05, 02:49
+
Keith Turner 2013-06-05, 12:44
+
Josh Elser 2013-06-05, 13:16
+
Keith Turner 2013-06-05, 14:51
+
Josh Elser 2013-06-05, 16:23
+
Christopher 2013-06-05, 16:29
+
Billie Rinaldi 2013-06-05, 16:48
+
Christopher 2013-06-05, 17:07
+
Aaron G 2013-06-04, 13:41
+
Josh Elser 2013-06-04, 14:04
+
Aaron G 2013-06-04, 14:09
+
Keith Turner 2013-06-04, 13:35
+
Josh Elser 2013-06-04, 14:01
+
Keith Turner 2013-06-04, 21:51
+
Christopher 2013-06-04, 22:09
+
Christopher 2013-06-04, 22:11
+
David Medinets 2013-06-04, 22:27
+
Billie Rinaldi 2013-06-05, 12:17
+
David Medinets 2013-06-05, 16:49
+
Christopher 2013-06-05, 16:59
+
Christopher 2013-06-04, 18:34
+
Joe Stein 2013-06-04, 18:39
+
Drew Farris 2013-06-05, 01:37
+
Josh Elser 2013-06-04, 20:15
+
Christopher 2013-06-04, 21:05
+
Josh Elser 2013-06-14, 01:41