MobileRead Forums - View Single Post - How to merge Calibre updates to source code?

ldolse · 11-16-2010, 10:14 AM

I just keep a single local branch. If I have local uncommitted changes I just commit them before merging. You could alternatively try using the 'shelve' command before merging, but I never bothered with this aside from testing it to see that it worked as expected.

11-16-2010, 10:14 AM	#3
ldolse Wizard Posts: 1,337 Karma: 123455 Join Date: Apr 2009 Location: Malaysia Device: PRS-650, iPhone	I just keep a single local branch. If I have local uncommitted changes I just commit them before merging. You could alternatively try using the 'shelve' command before merging, but I never bothered with this aside from testing it to see that it worked as expected.