Commit bd0d04f
committed
README To-do item: Local commit branch behind its remote tracking branch
The problem that inspired this was:
git fetch
# origin/gh-pages is now ahead of local repo's gh-pages
git-commit-filetree gh-pages _site/
# gh-pages has forked because the parent of the commit we
# just made is not the latest commit on gh-pages from the
# source repo
The current workaround is to manually check out and update
(fast-forward) the local branch before going back to do our release,
which kinda kills the key feature we provide of not having to switch
one's working copy back and forth between branches.1 parent 2aaa89f commit bd0d04f
1 file changed
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
44 | 47 | | |
45 | 48 | | |
46 | 49 | | |
| |||
0 commit comments