Any git experts out there? I've been working out of a branch for my latest MAME-related changes, now I'm trying to figure out how to merge my branch up to mainline so that I can merge it over *to* mainline and then close it out.
Näytä tämä ketju
-
fingers crossed you got lucky for once.
It helps that I was working on brand new code and was only checking into a branch so that a couple people could assist me. Normally I'd have worked out of the main branch and not had to deal with this crap.
-
-
Feature branches are good. You can go do whatever you want: do incremental checkins that don't build but are good logical steps towards success. You can stop working on it and come back to it later etc. When you are done, squash it flat into a single commit and merge it over.
Kiitos. Käytämme tätä aikajanasi parantamiseen. KumoaKumoa
-
Lataaminen näyttää kestävän hetken.
Twitter saattaa olla ruuhkautunut tai ongelma on muuten hetkellinen. Yritä uudelleen tai käy Twitterin tilasivulla saadaksesi lisätietoja.