Description Susan McCourt 2011-09-28 12:40:32 EDT

Today I was trying to merge with the remote master of the git client.  I had a bunch of "not ready for prime time" changes I was playing with that I didn't want to lose.  The merge failed since I had a dirty working tree (bug 359259).  But then I was kind of stuck. 

On the command line I would have stashed my changes, merged, created a new branch, popped my changes, and continued, but I was unsure of an alternate workflow.  Szymon helped me.

During this discussion we talked about having a wiki page with "Orion Git hints and tips."  This could include:

- general git workflow hints
- workflow hints to deal with alternate workflows (what to do since we don't support stash)
- hints to deal with unclear error messages (bug 358153, bug 359259, etc.)

We could use known anchor tags on the page for different categories of problems.  For example:

"pushing"
"merging"
"cloning"

etc.

Then the git error messages could include a link to this wiki page with the anchor tag that most closely relates to the problem.

We can all update the wiki as we run into problems.