Also, if you get lost in where you're at or how you got there, `git reflog`
is your friend.
On Sun, Nov 17, 2013 at 10:55 PM, Bruce Cran <br...@cran.org.uk> wrote:
> On 11/18/2013 2:58 AM, Blair Murri wrote:
>
> 1. Update my local "base" branch (now wix39 or master, depending on the
> bug/feature I'm investigating) from the latest sources.
> 2. Branch that "base" branch to the "issue" branch (in my case, I name my
> branches as <issue-type><issue-number>)
> 3. Work my issue (design, code, test, iterate). Some issues take some
> time, so I go back to 1 and repeat with other new branches for other issues
> I'm simultaneously working, unless the resolution for one issue depends on
> another.
> 4. Update my "base" branch again. Merge changes in "base" into "issue",
> rebuild, retest, push "issue" to fork and request pull.
>
>
> By 'merge', do you mean you rebase your changes? I've not used Git much so
> I don't know if this is overly complex, but the workflow I normally use
> (not for WiX) is:
>
> Make sure I have the latest code:
> > git fetch upstream
> > git merge upstream/master
> Create and checkout my issue branch, tracking the local master:
> > git checkout -b issue_branch master
> change files
> commit them
> > git commit -u
> Get the latest changes:
> > git checkout master
> > git fetch upstream
> > git merge upstream/master
> Rebase onto those changes:
> > git checkout issue_branch
> > git rebase master
> Push changes upstream then delete the branch:
> > git push upstream issue_branch:master
> > git checkout master
> > git branch -D issue_branch
>
> I've started using SourceTree for cherry-picking (equivalent to
> transplanting in Hg) changes, and will probably try and use it more in
> future for routine stuff.
>
> --
> Bruce Cran
>
>
> ------------------------------------------------------------------------------
> DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps
> OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
> Free app hosting. Or install the open source package on any LAMP server.
> Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
> http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
> _______________________________________________
> WiX-devs mailing list
> WiX-devs@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/wix-devs
>
>
------------------------------------------------------------------------------
DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wix-devs
