origin/master x------------------------------------x master
\
\--o--o--o--o--o--o--o--o--o--o--o dev
origin/dev
I've got a respository with a master and dev branch. Things were going
along well
until I pushed the dev branch remotely. Now if I need to make a quick
fix to the master
branch, I get the fork you see above. This doesn't seem like an issue
until you try to merge
or rebase the dev branch. If I rebase, I end up with something like
origin/master x------------------------------------x--o--o--o--o--o--
o--o--o--o--o--o dev
\ master
\
\--o--o--o--o--o--o--o--o--o--o--o origin/dev
which doesn't let me push the dev branch to origin/dev without
complaining.
Another option is to do the same thing above (git co dev && git rebase
master) but then blow away
the remote dev branch (git push origin :dev) and then re-push it (git
co dev && git push origin dev)
This seems messy, especially if you have multiple people working on
the dev branch. Normally I wouldn't
want to push the dev branch remotely, but if I've got a series of
commits in there, I'm using the remote as a backup more than anything.
I'm wondering if there is a clean way to do this, or will i need to
just (git co dev && git merge master)
and suck up the Merge branch 'master' into 'dev' comment?
Thanks.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"GitHub" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/github?hl=en
-~----------~----~----~----~------~----~------~--~---
