Branch Management

[Joel Madero]

Hi All,

I submitted 3 patches today from different local branches but 
unfortunately I think that changes carried over to different branches so 
I may have committed the same changes multiple times. Apologies to 
whoever has to review those :-/

I think the wiki just needs a bit of clarification for noobs using 
multiple branches like me as the instructions don't warn about things 
like double submitting changes if you commit multiple changes from 
different branches.

For instance: https://gerrit.libreoffice.org/#/c/5381/

I only wanted ruler.hxx, dialogs.hrc and ruler.src included on this one 
but apparently CalcCommands snuck in there as well which I had changed 
on a different branch and already committed the patch on a different 
local branch.

Thanks and apologies.


Best,
Joel

		Commit Message <https://gerrit.libreoffice.org/#/c/5381/1//COMMIT_MSG> 	
		Side-by-Side <https://gerrit.libreoffice.org/#/c/5381/1//COMMIT_MSG> 
Unified <https://gerrit.libreoffice.org/#/c/5381/1//COMMIT_MSG,unified>
	M 	include/svtools/ruler.hxx 
<https://gerrit.libreoffice.org/#/c/5381/1/include/svtools/ruler.hxx> 	
	+2, -2 	Side-by-Side 
<https://gerrit.libreoffice.org/#/c/5381/1/include/svtools/ruler.hxx> 
Unified 
<https://gerrit.libreoffice.org/#/c/5381/1/include/svtools/ruler.hxx,unified> 

	M 	include/svx/dialogs.hrc 
<https://gerrit.libreoffice.org/#/c/5381/1/include/svx/dialogs.hrc> 	
	+3, -2 	Side-by-Side 
<https://gerrit.libreoffice.org/#/c/5381/1/include/svx/dialogs.hrc> 
Unified 
<https://gerrit.libreoffice.org/#/c/5381/1/include/svx/dialogs.hrc,unified>
	M 	officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
<https://gerrit.libreoffice.org/#/c/5381/1/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu> 
	
	+7, -1 	Side-by-Side 
<https://gerrit.libreoffice.org/#/c/5381/1/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu> 
	Unified 
<https://gerrit.libreoffice.org/#/c/5381/1/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu,unified> 

	M 	svx/source/dialog/ruler.src 
<https://gerrit.libreoffice.org/#/c/5381/1/svx/source/dialog/ruler.src> 	
	+4, -4 	Side-by-Side 
<https://gerrit.libreoffice.org/#/c/5381/1/svx/source/dialog/ruler.src> 	Unified 
<https://gerrit.libreoffice.org/#/c/5381/1/svx/source/dialog/ruler.src,unified> 

	
	+16, -9

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20130812/268dea6d/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: clear.cache.gif
Type: image/gif
Size: 43 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20130812/268dea6d/attachment.gif>