| === yofel_ is now known as yofel | ||
| JPeterson | how do i get past bzr merge, bzr: ERROR: Working tree ... has uncommitted changes (See bzr status). | 20:30 |
|---|---|---|
| JPeterson | so what? | 20:30 |
| JPeterson | how do i force merge? | 20:30 |
| JPeterson | how do i do git stash? | 20:32 |
| JPeterson | Answer: bzr shelve --ll | 20:37 |
| JPeterson | *--all | 20:37 |
| JPeterson | holy cow. "bzr shelve --all; bzr merge; bzr unshelve" now show both the reomte and my changes | 20:40 |
| JPeterson | should i do bzr pull instead? | 20:40 |
| JPeterson | the answer to "22:30] <JPeterson> how do i get past bzr merge, bzr: ERROR: Working tree ... has uncommitted changes (See bzr status)." is "bzr pull" | 20:42 |
| JPeterson | this will not revert the local changes | 20:42 |
| fullermd | For forcing a merge, you want --force. What do you expect from shelve;merge;unshelve but a combo of the changes? | 21:22 |
| bob2 | er | 23:25 |
| bob2 | a) don't merge when you have local changes | 23:25 |
| bob2 | b) commit immediately after merging + fixing conflicts | 23:25 |
| bob2 | it's dvcs, no reason to let your code get screwed up like you would with svn | 23:31 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!