Bug 1227863 - Don't create corrupt DB logger until we need to write a…

[mauryat]

… corrupt DB log

@sleroux, I couldn't update the previously existing pull request. I synced my fork with the upstream master. Then, had to delete the remote branch because the local history now had commits from the upstream master. Deleting the remote branch caused the pull request to be closed automatically. Do you know of any way how I can continue to work on the same pull request (while at the same time constantly syncing my branch with the upstream master)?

Note: By syncing my upstream master I mean that I did a rebase (not a merge). Rebase has the advantage of keeping the history clean.

[sleroux]

@user640378 After syncing your fork's master branch, did you also try rebasing master into the branch you were working on? This should overlay your branch commits on top of the updated master. I know the github docs here [1] use merging for updating the fork and you mentioned you rebased but usually if I want a fresh copy of the master from remote I just reset my local copy like so:

git reset --hard origin/master

I always work on feature branches so my master shouldn't have any in-progress commits so this will just reset my master to whatever remote has. From this point I can rebase the feature branch by switching to the branch and running

git rebase master

This will pull in the master commits and overlay my branch commits on top. Only downside is I then have to force push my branch since the history has been rewritten with the new master commits.

[1] https://help.github.com/articles/syncing-a-fork/

[mauryat]

@sleroux, yes I did rebase master into my branch also. I didn't know that I could force push my branch! I deleted the remote branch and pushed my local again to remote. I'll try force pushing next time :)