zotero / scaffold

Zotero translator creation IDE
http://www.zotero.org/support/dev/scaffold
38 stars 9 forks source link

Move browser tab rebase #55

Closed zuphilip closed 6 years ago

adomasven commented 6 years ago

So with pull requests you can just rebase the existing branch and then force push. I.e.

git checkout master
git pull master
git checkout move-browser-tab
git rebase master
# Solve conflicts
git push -f
zuphilip commented 6 years ago

@adomasven Yes, these are the steps I wanted to do. But solving the conflicts were difficult here (because the changes of spaces showed more or less everything as a block from master and this branch). Thus, after I will I guessed that is easier to redo the commits on top of master.

zuphilip commented 6 years ago

I forgot to do this (but we can do that later):

Now, we might want to delete one of the Current URL. I suggests to have that in the browser pane only.

Agreed.