@textfiles I mean I guess I appreciate the visibility, but I think this is not so much of an emergency that it needed that. 
Näytä tämä ketju
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.
-
-
Kiitos. Käytämme tätä aikajanasi parantamiseen. KumoaKumoa
-
-
-
You want to do one of two things (& it's a choice for you): 1) Rebase your work on mainline. This makes it look as if you did all your work on top of mainline. -OR- 2) Merge mainline into your branch so it's ready to move over. Both force you to resolve conflicting changes.
-
I'm aware of the options, just not the exact incantations for doing either.
- Näytä vastaukset
Uusi keskustelu -
-
-
Here's some basic info about git and merging: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging …
Kiitos. Käytämme tätä aikajanasi parantamiseen. KumoaKumoa
-
-
-
git checkout master (assuming this is what you call "mainline" git merge nameofyourbranch Then spend the rest of your life fixing the conflicts.
-
Seems to have worked just fine, no conflicts.
- Näytä vastaukset
Uusi keskustelu -
-
-
If you encounter some conflicts and manual merge is necissary, using a mergetool (like tortoisemerge) can be very handy. You can also edit the files containing conflicts by hand, where GIT have inserted lots of ASCII-art arrows to show blocks of old and new code side by side.
Kiitos. Käytämme tätä aikajanasi parantamiseen. KumoaKumoa
-
-
-
For people starting (or not yet confident) with git, I can't recommend enough a client that visualises the commit tree and always keeps you informed on "what's up" right now. My absolute favourite client for that is GitKraken but there's also SourceTree and others..
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.