git conflicting きれい解決方法
1. git checkout develop
2. git pull
3. git checkout <currecy-branch>
4. git rebase develop
5. <editor> conflicting resolve
6. git add .
7. git rebase --continue // 注意:git commit ではない
8. git push -f
code: git push -f 失敗エラー
fatal: The upstream branch of your current branch does not match
the name of your current branch. To push to the upstream branch
on the remote, use
git push origin HEAD:feature/add-more-watch-button
To push to the branch of the same name on the remote, use
git push origin HEAD
解決方法:GUI Tool (例えば: Fork SourceTree) に <current-branch> を double-click