Comments on: Dealing with rejection in git, resetting your master to theirs and starting over http://www.justaprogrammer.net/2010/07/03/dealing-with-rejection-in-git-resetting-your-master-to-theirs-and-starting-over/ We're Just Programmers... Mon, 16 Jan 2012 07:27:00 +0000 hourly 1 http://wordpress.org/?v=3.3.1 By: Justin http://www.justaprogrammer.net/2010/07/03/dealing-with-rejection-in-git-resetting-your-master-to-theirs-and-starting-over/comment-page-1/#comment-32 Justin Sun, 04 Jul 2010 04:13:49 +0000 http://www.justaprogrammer.net/?p=171#comment-32 This is a different scenario than branching off the working set. 1) Assign myself a work item (contributing to an OSS project in my free time I get to pick) 2) Code/Compile/Test/Retest/Whatever 3) Commit working code 4) Push to my github branch 5) Send a pull request 6) Get a rejection (usually with a try again later) So what I really need is a branch strategy that involves having a branch of mine thats always a pristine copy of their master, so I can rename my master with impunity. This is a different scenario than branching off the working set.
1) Assign myself a work item (contributing to an OSS project in my free time I get to pick)
2) Code/Compile/Test/Retest/Whatever
3) Commit working code
4) Push to my github branch
5) Send a pull request
6) Get a rejection (usually with a try again later)

So what I really need is a branch strategy that involves having a branch of mine thats always a pristine copy of their master, so I can rename my master with impunity.

]]> By: Ben http://www.justaprogrammer.net/2010/07/03/dealing-with-rejection-in-git-resetting-your-master-to-theirs-and-starting-over/comment-page-1/#comment-31 Ben Sun, 04 Jul 2010 04:09:51 +0000 http://www.justaprogrammer.net/?p=171#comment-31 Oh... and microsoft gave a name to what I described above. They call it "shelving." Whatever... its a branch off based on workspace. They can call it magical for all I care. I've been doing it for years. Oh… and microsoft gave a name to what I described above. They call it “shelving.”

Whatever… its a branch off based on workspace.

They can call it magical for all I care. I’ve been doing it for years.

]]> By: Ben http://www.justaprogrammer.net/2010/07/03/dealing-with-rejection-in-git-resetting-your-master-to-theirs-and-starting-over/comment-page-1/#comment-30 Ben Sun, 04 Jul 2010 04:02:45 +0000 http://www.justaprogrammer.net/?p=171#comment-30 It's a good habit to branch before the fact, but you can base your branch off your current working copy with svn. I often find myself doing that at work when I take on a ticket that I think will be easy, then when 5:30 rolls around I just check my changes into a branch and resume the next day. It’s a good habit to branch before the fact, but you can base your branch off your current working copy with svn.

I often find myself doing that at work when I take on a ticket that I think will be easy, then when 5:30 rolls around I just check my changes into a branch and resume the next day.

]]> By: Justin http://www.justaprogrammer.net/2010/07/03/dealing-with-rejection-in-git-resetting-your-master-to-theirs-and-starting-over/comment-page-1/#comment-28 Justin Sun, 04 Jul 2010 03:54:54 +0000 http://www.justaprogrammer.net/?p=171#comment-28 I'm not afraid of branches, just having trouble getting into the habit of branch per feature. I've been doing a branch after release at my current job with svn, and gotten one of my coworkers to consider it. I do need to learn to branch before the fact, especially on my Saturday one man mongo hackathons. If I start the day with a 5-10 item todo list I should make 5-10 branches, cherry pick my commits back to my master and send a pull request. I’m not afraid of branches, just having trouble getting into the habit of branch per feature.

I’ve been doing a branch after release at my current job with svn, and gotten one of my coworkers to consider it.

I do need to learn to branch before the fact, especially on my Saturday one man mongo hackathons. If I start the day with a 5-10 item todo list I should make 5-10 branches, cherry pick my commits back to my master and send a pull request.

]]> By: Ben http://www.justaprogrammer.net/2010/07/03/dealing-with-rejection-in-git-resetting-your-master-to-theirs-and-starting-over/comment-page-1/#comment-27 Ben Sun, 04 Jul 2010 03:49:52 +0000 http://www.justaprogrammer.net/?p=171#comment-27 I'm also not really sure why you are so afraid of branches. If it takes you more than a day to write a piece of code... it should be in a branch. I’m also not really sure why you are so afraid of branches.

If it takes you more than a day to write a piece of code… it should be in a branch.

]]> By: Ben http://www.justaprogrammer.net/2010/07/03/dealing-with-rejection-in-git-resetting-your-master-to-theirs-and-starting-over/comment-page-1/#comment-26 Ben Sun, 04 Jul 2010 03:49:16 +0000 http://www.justaprogrammer.net/?p=171#comment-26 Subversion > git Subversion > git

]]> By: Justin Dearing http://www.justaprogrammer.net/2010/07/03/dealing-with-rejection-in-git-resetting-your-master-to-theirs-and-starting-over/comment-page-1/#comment-55 Justin Dearing Sat, 03 Jul 2010 22:16:30 +0000 http://www.justaprogrammer.net/?p=171#comment-55 <span class="topsy_trackback_comment"><span class="topsy_twitter_username"><span class="topsy_trackback_content">RT @TopsyRT: Dealing with rejection in git, resetting your master to theirs and starting over http://bit.ly/a8ZfsT</span></span> RT @TopsyRT: Dealing with rejection in git, resetting your master to theirs and starting over http://bit.ly/a8ZfsT

]]>