These are chat archives for jacobsenmd/opengcs
Do ya'll know the best way to keep a local branch up to date with master? Currently I have the forked repo and I work on it from two different machines. So, generally I pull from the origin to a local repo, rebase my branch and then push back to the fork. If I switch machines I pull from the forked repo, usually just my branch. It seems though that when I rebase my local branch, I always have to correct merge errors in my branch files, including the one that is not even in origin/master at the moment. Is this avoidable, or is it just something that has to be done?
Also, I'm now up to date with master and am getting the toolbar/menu errors (windows). I looked into it for a bit as well, but didn't solve anything. It seems that the toolbar is working fine though it's just that the menubar isn't being isolated.
@jacobsenmd - it just broke with the newest commits I think. It was working fine previously and I'm able to pull up a simple mainwindow w/ toolbar/menu/dockwidget and it works fine.
Also, does one of the positions in the .ini file correspond to a central widget?